diff --git a/dev.html b/dev.html
index 1dfbf517b..d1a312a5f 100644
--- a/dev.html
+++ b/dev.html
@@ -28,6 +28,7 @@
     });
 
     converse.initialize({
+        theme: 'dracula',
         auto_away: 300,
         enable_smacks: true,
         loglevel: 'debug',
diff --git a/src/plugins/muc-views/modals/occupant.js b/src/plugins/muc-views/modals/occupant.js
index 0bee536f8..f623fe1a8 100644
--- a/src/plugins/muc-views/modals/occupant.js
+++ b/src/plugins/muc-views/modals/occupant.js
@@ -28,24 +28,10 @@ export default class OccupantModal extends BaseModal {
     }
 
     renderModal () {
-        const model = this.model ?? this.message;
-        const jid = model?.get('jid');
-        const vcard = this.getVcard();
-        const nick = model.get('nick');
-        const occupant_id = model.get('occupant_id');
-        const role = this.model?.get('role');
-        const affiliation = this.model?.get('affiliation');
-        const hats = this.model?.get('hats')?.length ? this.model.get('hats') : null;
-        const muc = this.model.collection.chatroom;
-        const addToContacts = api.contacts.get(jid).then(contact => {
-            if (!contact && muc.features.get('nonanonymous') && jid && jid != _converse.bare_jid) {
-                return this.addToContacts.bind(this);
-            }
-        });
-        return tpl_occupant_modal({ jid, vcard, nick, occupant_id, role, affiliation, hats, addToContacts });
+        return tpl_occupant_modal(this);
     }
 
-    getModalTitle () { // eslint-disable-line class-methods-use-this
+    getModalTitle () {
         const model = this.model ?? this.message;
         return model?.getDisplayName();
     }
diff --git a/src/plugins/muc-views/modals/templates/occupant.js b/src/plugins/muc-views/modals/templates/occupant.js
index c5de45c68..2c248811e 100644
--- a/src/plugins/muc-views/modals/templates/occupant.js
+++ b/src/plugins/muc-views/modals/templates/occupant.js
@@ -2,40 +2,59 @@ import 'shared/avatar/avatar.js';
 import { __ } from 'i18n';
 import { html } from "lit";
 import { until } from 'lit/directives/until.js';
+import { _converse, api } from "@converse/headless/core";
 
 
-export default (o) => {
-    const addToContacts = o.addToContacts.then(add => add ? html`<li><button class="btn btn-primary" type="button" @click=${add}>${__('Add to Contacts')}</button></li>` : '');
+export default (el) => {
+    const model = el.model ?? el.message;
+    const jid = model?.get('jid');
+    const vcard = el.getVcard();
+    const nick = model.get('nick');
+    const occupant_id = model.get('occupant_id');
+    const role = el.model?.get('role');
+    const affiliation = el.model?.get('affiliation');
+    const hats = el.model?.get('hats')?.length ? el.model.get('hats') : null;
+    const muc = el.model.collection.chatroom;
+
+    const i18n_add_to_contacts = __('Add to Contacts');
+
+    const can_see_real_jids = muc.features.get('nonanonymous') || muc.getOwnRole() === 'moderator';
+    const not_me =  jid != _converse.bare_jid;
+
+    const add_to_contacts = api.contacts.get(jid)
+        .then(contact => !contact && not_me && can_see_real_jids)
+        .then(add => add ? html`<li><button class="btn btn-primary" type="button" @click=${() => el.addToContacts()}>${i18n_add_to_contacts}</button></li>` : '');
+
     return html`
         <div class="row">
             <div class="col-auto">
                 <converse-avatar
                     class="avatar modal-avatar"
-                    .data=${o.vcard?.attributes}
-                    nonce=${o.vcard?.get('vcard_updated')}
+                    .data=${vcard?.attributes}
+                    nonce=${vcard?.get('vcard_updated')}
                     height="120" width="120"></converse-avatar>
             </div>
             <div class="col">
                 <ul class="occupant-details">
                     <li>
-                        ${ o.nick ? html`<div class="row"><strong>${__('Nickname')}:</strong></div><div class="row">${o.nick}</div>` : '' }
+                        ${ nick ? html`<div class="row"><strong>${__('Nickname')}:</strong></div><div class="row">${nick}</div>` : '' }
                     </li>
                     <li>
-                        ${ o.jid ? html`<div class="row"><strong>${__('XMPP Address')}:</strong></div><div class="row">${o.jid}</div>` : '' }
+                        ${ jid ? html`<div class="row"><strong>${__('XMPP Address')}:</strong></div><div class="row">${jid}</div>` : '' }
                     </li>
                     <li>
-                        ${ o.affiliation ? html`<div class="row"><strong>${__('Affiliation')}:</strong></div><div class="row">${o.affiliation}</div>` : '' }
+                        ${ affiliation ? html`<div class="row"><strong>${__('Affiliation')}:</strong></div><div class="row">${affiliation}</div>` : '' }
                     </li>
                     <li>
-                        ${ o.role ? html`<div class="row"><strong>${__('Roles')}:</strong></div><div class="row">${o.role}</div>` : '' }
+                        ${ role ? html`<div class="row"><strong>${__('Roles')}:</strong></div><div class="row">${role}</div>` : '' }
                     </li>
                     <li>
-                        ${ o.hats ? html`<div class="row"><strong>${__('Hats')}:</strong></div><div class="row">${o.hats}</div>` : '' }
+                        ${ hats ? html`<div class="row"><strong>${__('Hats')}:</strong></div><div class="row">${hats}</div>` : '' }
                     </li>
                     <li>
-                        ${ o.occupant_id ? html`<div class="row"><strong>${__('Occupant Id')}:</strong></div><div class="row">${o.occupant_id}</div>` : '' }
+                        ${ occupant_id ? html`<div class="row"><strong>${__('Occupant Id')}:</strong></div><div class="row">${occupant_id}</div>` : '' }
                     </li>
-                    ${ until(addToContacts, '') }
+                    ${ until(add_to_contacts, '') }
                 </ul>
             </div>
         </div>
diff --git a/src/plugins/omemo/mixins/converse.js b/src/plugins/omemo/mixins/converse.js
index 4badf874c..575f13ef2 100644
--- a/src/plugins/omemo/mixins/converse.js
+++ b/src/plugins/omemo/mixins/converse.js
@@ -3,16 +3,16 @@ import { generateFingerprint, getDevicesForContact, } from '../utils.js';
 
 const ConverseMixins = {
 
-    generateFingerprints: async function (jid) {
+    async generateFingerprints (jid) {
         const devices = await getDevicesForContact(jid);
         return Promise.all(devices.map(d => generateFingerprint(d)));
     },
 
-    getDeviceForContact: function (jid, device_id) {
+    getDeviceForContact (jid, device_id) {
         return getDevicesForContact(jid).then(devices => devices.get(device_id));
     },
 
-    contactHasOMEMOSupport: async function (jid) {
+    async contactHasOMEMOSupport (jid) {
         /* Checks whether the contact advertises any OMEMO-compatible devices. */
         const devices = await getDevicesForContact(jid);
         return devices.length > 0;