Index: ps/trunk/binaries/data/config/default.cfg
===================================================================
--- ps/trunk/binaries/data/config/default.cfg
+++ ps/trunk/binaries/data/config/default.cfg
@@ -333,7 +333,7 @@
 
 [gui.gamesetup]
 enabletips = true                 ; Enable/Disable tips during gamesetup (for newcomers)
-assignplayers = everyone          ; Whether to assign joining clients to free playerslots. Possible values: everyone, buddies, noone.
+assignplayers = everyone          ; Whether to assign joining clients to free playerslots. Possible values: everyone, buddies, disabled.
 
 [gui.session]
 camerajump.threshold = 40         ; How close do we have to be to the actual location in order to jump back to the previous one?
@@ -396,7 +396,7 @@
 
 [network]
 duplicateplayernames = false      ; Rename joining player to "User (2)" if "User" is already connected, otherwise prohibit join.
-lateobservers = buddies           ; Allow observers to join the game after it started. Possible values: disabled, buddies, everyone.
+lateobservers = everyone          ; Allow observers to join the game after it started. Possible values: everyone, buddies, disabled.
 observerlimit = 8                 ; Prevent further observer joins in running games if this limit is reached
 
 [overlay]
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -1304,7 +1304,7 @@
 	if (!isRejoiningPlayer && playername != newAssignments[Engine.GetPlayerGUID()].name)
 	{
 		let assignOption = Engine.ConfigDB_GetValue("user", "gui.gamesetup.assignplayers");
-		if (assignOption == "noone" ||
+		if (assignOption == "disabled" ||
 		    assignOption == "buddies" && g_Buddies.indexOf(splitRatingFromNick(playername)[0]) == -1)
 			return;
 	}
Index: ps/trunk/binaries/data/mods/public/gui/options/options.json
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/options/options.json
+++ ps/trunk/binaries/data/mods/public/gui/options/options.json
@@ -82,13 +82,13 @@
 		{
 			"type": "dropdown",
 			"label": "Assign Players",
-			"tooltip": "Whether to assign joining clients to free playerslots in the gamesetup.",
+			"tooltip": "Automatically assign joining clients to free player slots during the match setup.",
 			"parameters": {
 				"config": "gui.gamesetup.assignplayers",
 				"list": [
 					{ "value": "everyone", "label": "Everyone" },
 					{ "value": "buddies", "label": "Buddies" },
-					{ "value": "noone", "label": "No one" }
+					{ "value": "disabled", "label": "Disabled" }
 				]
 			}
 		},