diff --git a/src/plugins/muc-views/modals/occupant.js b/src/plugins/muc-views/modals/occupant.js
index 458be9fad..ac5f1494b 100644
--- a/src/plugins/muc-views/modals/occupant.js
+++ b/src/plugins/muc-views/modals/occupant.js
@@ -41,6 +41,11 @@ export default class OccupantModal extends BaseModal {
         const jid = model.get('jid');
         if (jid) api.modal.show('converse-add-contact-modal', {'model': new Model({ jid })});
     }
+
+    toggleForm () {
+        this.show_affiliation_form = !this.show_affiliation_form;
+        this.render();
+    }
 }
 
 api.elements.define('converse-muc-occupant-modal', OccupantModal);
diff --git a/src/plugins/muc-views/modals/templates/occupant.js b/src/plugins/muc-views/modals/templates/occupant.js
index e5704763e..358890457 100644
--- a/src/plugins/muc-views/modals/templates/occupant.js
+++ b/src/plugins/muc-views/modals/templates/occupant.js
@@ -43,7 +43,18 @@ export default (el) => {
                         ${ jid ? html`<div class="row"><strong>${__('XMPP Address')}:</strong></div><div class="row">${jid}</div>` : '' }
                     </li>
                     <li>
-                        ${ affiliation ? html`<div class="row"><strong>${__('Affiliation')}:</strong></div><div class="row">${affiliation}</div>` : '' }
+                        <div class="row"><strong>${__('Affiliation')}:</strong></div>
+                        <div class="row">${affiliation}&nbsp;
+                            <a href="#"
+                               data-form="affiliation-form"
+                               class="toggle-form right"
+                               color="var(--subdued-color)"
+                               @click=${() => el.toggleForm()}>
+
+                                <converse-icon class="fa fa-wrench" size="1em"></converse-icon>
+                            </a>
+                            ${ el.show_affiliation_form ? html`<converse-muc-affiliation-form jid=${jid} .muc=${muc} affiliation=${affiliation}></converse-muc-affiliation-form>` : '' }
+                        </div>
                     </li>
                     <li>
                         ${ role ? html`<div class="row"><strong>${__('Role')}:</strong></div><div class="row">${role}</div>` : '' }