diff --git a/lib/models/room.js b/lib/models/room.js
index 5b0a25d5b..9ece7cae1 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -743,12 +743,12 @@ function calculateRoomName(room, userId, ignoreRoomNameEvent) {
                 }
             }
             else {
-                return userId; // XXX: why userId and not displayname or something?
+                return memberList[0].name;
             }
         }
         else {
             // there really isn't anyone in this room...
-            return "?";
+            return "Empty room";
         }
     }
     else if (members.length === 1) {
diff --git a/spec/unit/room.spec.js b/spec/unit/room.spec.js
index b4b8471ff..00e3a4bc4 100644
--- a/spec/unit/room.spec.js
+++ b/spec/unit/room.spec.js
@@ -328,50 +328,40 @@ describe("Room", function() {
 
         it("should return true for a matching userId and membership",
         function() {
-            room.currentState.getMembers.andCallFake(function() {
-                return [
-                    { userId: "@alice:bar", membership: "join" },
-                    { userId: "@bob:bar", membership: "invite" }
-                ];
-            });
+            room.currentState.members = {
+                "@alice:bar": { userId: "@alice:bar", membership: "join" },
+                "@bob:bar": { userId: "@bob:bar", membership: "invite" }
+            };
             expect(room.hasMembershipState("@bob:bar", "invite")).toBe(true);
         });
 
         it("should return false if match membership but no match userId",
         function() {
-            room.currentState.getMembers.andCallFake(function() {
-                return [
-                    { userId: "@alice:bar", membership: "join" }
-                ];
-            });
+            room.currentState.members = {
+                "@alice:bar": { userId: "@alice:bar", membership: "join" }
+            };
             expect(room.hasMembershipState("@bob:bar", "join")).toBe(false);
         });
 
         it("should return false if match userId but no match membership",
         function() {
-            room.currentState.getMembers.andCallFake(function() {
-                return [
-                    { userId: "@alice:bar", membership: "join" }
-                ];
-            });
+            room.currentState.members = {
+                "@alice:bar": { userId: "@alice:bar", membership: "join" }
+            };
             expect(room.hasMembershipState("@alice:bar", "ban")).toBe(false);
         });
 
         it("should return false if no match membership or userId",
         function() {
-            room.currentState.getMembers.andCallFake(function() {
-                return [
-                    { userId: "@alice:bar", membership: "join" }
-                ];
-            });
+            room.currentState.members = {
+                "@alice:bar": { userId: "@alice:bar", membership: "join" }
+            };
             expect(room.hasMembershipState("@bob:bar", "invite")).toBe(false);
         });
 
         it("should return false if no members exist",
         function() {
-            room.currentState.getMembers.andCallFake(function() {
-                return [];
-            });
+            room.currentState.members = {};
             expect(room.hasMembershipState("@foo:bar", "join")).toBe(false);
         });
     });