Index: binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -61,7 +61,8 @@
  */
 var g_RomanNumbers = [undefined, "I", "II", "III", "IV", "V", "VI", "VII", "VIII"];
 
-var g_PlayerTeamList = prepareForDropdown([{
+var g_PlayerTeamList = prepareForDropdown(
+	[{
 		"label": translateWithContext("team", "None"),
 		"id": -1
 	}].concat(
@@ -77,7 +78,8 @@
  */
 var g_RelicCountList = Object.keys(g_CivData).map((civ, i) => i + 1);
 
-var g_PlayerCivList = g_CivData && prepareForDropdown([{
+var g_PlayerCivList = g_CivData && prepareForDropdown(
+	[{
 		"name": translateWithContext("civilization", "Random"),
 		"tooltip": translate("Picks one civilization at random when the game starts."),
 		"color": g_ColorRandom,
@@ -1328,7 +1330,7 @@
 			offset = -Math.min(slideSpeed * dt, maxOffset);
 	}
 
-	updateSettingsPanelPosition(offset);	
+	updateSettingsPanelPosition(offset);
 }
 
 /**
Index: binaries/data/mods/public/gui/lobby/lobby.js
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby.js
+++ binaries/data/mods/public/gui/lobby/lobby.js
@@ -47,11 +47,11 @@
  * The playerlist will be assembled using these values.
  */
 var g_PlayerStatuses = {
-	"available": { "color": "0 219 0",     "status": translate("Online") },
-	"away":      { "color": "229 76 13",   "status": translate("Away") },
-	"playing":   { "color": "200 0 0",     "status": translate("Busy") },
-	"offline":   { "color": "0 0 0",       "status": translate("Offline") },
-	"unknown":   { "color": "178 178 178", "status": translateWithContext("lobby presence", "Unknown") }
+	"available": { "color": "0 219 0", "status": translate("Online") },
+	"away": { "color": "229 76 13", "status": translate("Away") },
+	"playing": { "color": "200 0 0", "status": translate("Busy") },
+	"offline": { "color": "0 0 0", "status": translate("Offline") },
+	"unknown": { "color": "178 178 178", "status": translateWithContext("lobby presence", "Unknown") }
 };
 
 var g_RoleNames = {
@@ -210,17 +210,17 @@
 					me ?
 						translate("You have been muted.") :
 						translate("%(nick)s has been muted.") :
-				msg.newrole == "moderator" ?
-					me ?
-						translate("You are now a moderator.") :
-						translate("%(nick)s is now a moderator.") :
-				msg.oldrole == "visitor" ?
-					me ?
-						translate("You have been unmuted.") :
-						translate("%(nick)s has been unmuted.") :
-					me ?
-						translate("You are not a moderator anymore.") :
-						translate("%(nick)s is not a moderator anymore.");
+					msg.newrole == "moderator" ?
+						me ?
+							translate("You are now a moderator.") :
+							translate("%(nick)s is now a moderator.") :
+						msg.oldrole == "visitor" ?
+							me ?
+								translate("You have been unmuted.") :
+								translate("%(nick)s has been unmuted.") :
+							me ?
+								translate("You are not a moderator anymore.") :
+								translate("%(nick)s is not a moderator anymore.");
 
 			addChatMessage({
 				"text": "/special " + sprintf(txt, { "nick": msg.nick }),
@@ -1011,10 +1011,6 @@
 		let sortA, sortB;
 		switch (sortBy)
 		{
-		case 'name':
-			sortA = g_GameStatusOrder.indexOf(a.state) + a.name.toLowerCase();
-			sortB = g_GameStatusOrder.indexOf(b.state) + b.name.toLowerCase();
-			break;
 		case 'gameRating':
 		case 'mapSize':
 		case 'mapType':
@@ -1033,6 +1029,11 @@
 			sortA = a.maxnbp;
 			sortB = b.maxnbp;
 			break;
+		case 'name':
+		default:
+			sortA = g_GameStatusOrder.indexOf(a.state) + a.name.toLowerCase();
+			sortB = g_GameStatusOrder.indexOf(b.state) + b.name.toLowerCase();
+			break;
 		}
 		if (sortA < sortB) return -sortOrder;
 		if (sortA > sortB) return +sortOrder;