Index: binaries/data/mods/public/gui/gamesetup/Controllers/LobbyGameRegistration.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/Controllers/LobbyGameRegistration.js
+++ binaries/data/mods/public/gui/gamesetup/Controllers/LobbyGameRegistration.js
@@ -21,7 +21,7 @@
 		// Events
 		setupWindow.registerClosePageHandler(this.onClosePage.bind(this));
 		netMessages.registerNetMessageHandler("start", this.onGameStart.bind(this));
-		playerAssignmentsController.registerPlayerAssignmentsChangeHandler(this.sendImmediately.bind(this));
+		playerAssignmentsController.registerPlayerAssignmentsChangeHandler(this.onSettingsChange.bind(this));
 
 		g_GameSettings.map.watch(() => this.onSettingsChange(), ["map", "type"]);
 		g_GameSettings.mapSize.watch(() => this.onSettingsChange(), ["size"]);
@@ -144,4 +144,4 @@
 /**
  * Send the current game settings to the lobby bot if the settings didn't change for this number of milliseconds.
  */
-LobbyGameRegistrationController.prototype.Timeout = 2000;
+LobbyGameRegistrationController.prototype.Timeout = 500;