diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index ba0d2866..dab2eceb 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -336,11 +336,12 @@ MultiUserChat tab commands
     :sorted:
 
     /affiliation
-       **Usage:** ``/affiliation <nick> <affiliation>``
+       **Usage:** ``/affiliation [<nick or jid> <affiliation>]``
 
-       Sets the affiliation of the participant designated by **nick** to the
-       given **affiliation** (can be one of owner, admin, member, outcast
-       and none).
+       Sets the affiliation of the participant designated by **nick** or
+       **jid** to the given **affiliation** (can be one of owner, admin,
+       member, outcast and none). If not argument is provided, lists
+       room affiliations.
 
     /role
        **Usage:** ``/affiliation <nick> <role>``
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index 9543e4c4..73359610 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -1601,7 +1601,7 @@ class MucTab(ChatTab):
     @command_args_parser.quoted(0, 2)
     def command_affiliation(self, args) -> None:
         """
-        /affiliation [<nick or jid> [<affiliation>]]
+        /affiliation [<nick or jid> <affiliation>]
         Changes the affiliation of a user
         affiliations can be: outcast, none, member, admin, owner
         """