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
@@ -866,8 +866,12 @@
 	g_DefaultPlayerData = g_Settings.PlayerDefaults;
 	g_DefaultPlayerData.shift();
 
+	// Can't change the underlying defaults file, as Atlas uses that file too
 	for (let i in g_DefaultPlayerData)
+	{
 		g_DefaultPlayerData[i].Civ = "random";
+		g_DefaultPlayerData[i].Teams = -1;
+	}
 }
 
 /**
@@ -1340,19 +1344,11 @@
 	if (playerData.length && !playerData[0])
 		playerData.shift();
 
+	// Use defaults if the map doesn't specify any explicitly
 	playerData.forEach((pData, index) => {
-		pData.Color = pData.Color || g_PlayerColorPickerList[index];
-		pData.Civ = pData.Civ || "random";
-
-		if (!("Team" in pData))
-			pData.Team = -1;
-
-		// Use default AI if the map doesn't specify any explicitly
-		if (!("AI" in pData))
-			pData.AI = g_DefaultPlayerData[index].AI;
-
-		if (!("AIDiff" in pData))
-			pData.AIDiff = g_DefaultPlayerData[index].AIDiff;
+		for (let prop of ["AI", "AIDiff", "Name", "Civ", "Team", "Color"])
+			if (!(prop in pData))
+				pData[prop] = g_DefaultPlayerData[index][prop];
 	});
 
 	// Replace colors with the best matching color of PlayerDefaults