diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index fcf4b6caf7..b9d5e26c1e 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -366,9 +366,11 @@ namespace OpenRA
 		public static void StartGame()
 		{
 			LoadMap(LobbyInfo.GlobalSettings.Map);
-			if( orderManager.GameStarted ) return;
+			if (orderManager.GameStarted) return;
 			chat.Reset();
 
+			world.SetLocalPlayer(orderManager.Connection.LocalClientId);
+
 			foreach (var c in LobbyInfo.Clients)
 				world.AddPlayer(new Player(world, c));