diff --git a/src/command/command.c b/src/command/command.c
index 90f168d1..5f44b6d4 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1259,6 +1259,7 @@ cmd_init(void)
     autocomplete_add(room_affiliation_ac, "owner");
     autocomplete_add(room_affiliation_ac, "admin");
     autocomplete_add(room_affiliation_ac, "member");
+    autocomplete_add(room_affiliation_ac, "none");
     autocomplete_add(room_affiliation_ac, "outcast");
 
     room_role_ac = autocomplete_new();
diff --git a/src/command/commands.c b/src/command/commands.c
index 39981b5f..7678f2c1 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -2206,13 +2206,18 @@ cmd_room(gchar **args, struct cmd_help_t help)
         if ((g_strcmp0(affiliation, "owner") != 0) &&
                 (g_strcmp0(affiliation, "admin") != 0) &&
                 (g_strcmp0(affiliation, "member") != 0) &&
+                (g_strcmp0(affiliation, "none") != 0) &&
                 (g_strcmp0(affiliation, "outcast") != 0)) {
             cons_show("Usage: %s", help.usage);
             return TRUE;
         }
 
         if (g_strcmp0(cmd, "list") == 0) {
-            iq_room_affiliation_list(room, affiliation);
+            if (g_strcmp0(affiliation, "none") == 0) {
+                win_save_print(window, '!', NULL, 0, 0, "", "Cannot list users with no affiliation.");
+            } else {
+                iq_room_affiliation_list(room, affiliation);
+            }
             return TRUE;
         }