diff -r 9f413bd5150e -r 41ebdb5f1e6e gameServer/Actions.hs
--- a/gameServer/Actions.hs	Wed Oct 07 14:37:42 2009 +0000
+++ b/gameServer/Actions.hs	Wed Oct 07 17:01:40 2009 +0000
@@ -250,7 +250,7 @@
 				clID,
 				serverInfo,
 				adjust (\cl -> cl{isMaster = True}) newMasterId clients,
-				adjust (\r -> r{name = newRoomName}) rID rooms
+				adjust (\r -> r{masterID = newMasterId, name = newRoomName}) rID rooms
 				)
 		newRoomName = nick newMasterClient
 		otherPlayersSet = IntSet.delete clID (playersIDs room)
@@ -262,6 +262,7 @@
 	let newServerInfo = serverInfo {nextRoomID = newID}
 	let room = newRoom{
 			roomUID = newID,
+			masterID = clID,
 			name = roomName,
 			password = roomPassword,
 			roomProto = (clientProto client)