diff --git a/commands.js b/commands.js
index cc109ee610..f0cabdacd0 100644
--- a/commands.js
+++ b/commands.js
@@ -105,10 +105,11 @@ var commands = exports.commands = {
 
 	makechatroom: function(target, room, user) {
 		if (!this.can('makeroom')) return;
-		if (Rooms.rooms[target]) {
+		var id = toId(target);
+		if (Rooms.rooms[id]) {
 			return this.sendReply("The room '"+target+"' already exists.");
 		}
-		Rooms.rooms[target] = new Rooms.ChatRoom(toId(target), target);
+		Rooms.rooms[id] = new Rooms.ChatRoom(id, target);
 		return this.sendReply("The room '"+target+"' was created.");
 	},
 
diff --git a/rooms.js b/rooms.js
index c624ac0d3b..de57b58e6a 100644
--- a/rooms.js
+++ b/rooms.js
@@ -1316,7 +1316,7 @@ var rooms = {};
 console.log("NEW GLOBAL: global");
 rooms.global = new GlobalRoom('global');
 console.log("NEW CHATROOM: lobby");
-rooms.lobby = new ChatRoom('lobby');
+rooms.lobby = new ChatRoom('lobby', 'Lobby');
 
 exports.GlobalRoom = GlobalRoom;
 exports.BattleRoom = BattleRoom;