diff --git a/lib/models/room.js b/lib/models/room.js
index a5a96b43e..59d94d556 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -720,7 +720,7 @@ function calculateRoomName(room, userId, ignoreRoomNameEvent) {
                 }
             }
             else {
-                return userId;
+                return userId; // XXX: why userId and not displayname or something?
             }
         }
         else {