diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 507dcd71e7..1f604f6b4a 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -138,6 +138,8 @@ namespace OpenRA
 			Rules.LoadRules(manifest);
 			Timer.Time( "load rules: {0}" );
 			Game.packageChangePending = false;
+			
+			LoadMap(manifest.ShellmapUid);
 		}
 		
 		public static void ChangeMap(string mapName)
diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs
index 66087122de..248d2aec08 100644
--- a/OpenRA.Game/Server/Server.cs
+++ b/OpenRA.Game/Server/Server.cs
@@ -467,8 +467,9 @@ namespace OpenRA.Server
 							SendChatTo( conn, "You can't change mods after the game has started" );
 							return true;
 						}
-
-						lobbyInfo.GlobalSettings.Mods = s.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+						var args = s.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).ToList();
+						lobbyInfo.GlobalSettings.Mods = args.GetRange(0,args.Count - 1).ToArray();
+						lobbyInfo.GlobalSettings.Map = args.Last();
 						SyncLobbyInfo();
 						return true;
 					}},