diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 20663a5bd7..c869c67e4c 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -636,18 +636,18 @@ function onGameAttributesChange()
 			mapSizeText.caption = "Map size:";
 			mapSize.selected = sizeIdx;
 			revealMapText.caption = "Reveal map:";
-			revealMap.checked = g_GameAttributes.settings.RevealMap ? true : false;
+			revealMap.checked = (g_GameAttributes.settings.RevealMap ? true : false);
 			victoryConditionText.caption = "Victory condition:";
 			victoryCondition.selected = victoryCondition.list_data.indexOf(g_GameAttributes.settings.GameType);
 			lockTeamsText.caption = "Teams locked:";
-			lockTeams.checked =  g_GameAttributes.settings.LockTeams ? true : false;
+			lockTeams.checked =  (g_GameAttributes.settings.LockTeams === undefined || g_GameAttributes.settings.LockTeams ? true : false);
 		}
 		else
 		{
-			mapSizeText.caption = "Map size: " + (mapSize.list[sizeIdx] !== undefined ? mapSize.list[sizeIdx] : "n/a");
+			mapSizeText.caption = "Map size: " + (mapSize.list[sizeIdx] !== undefined ? mapSize.list[sizeIdx] : "Default");
 			revealMapText.caption = "Reveal map: " + (g_GameAttributes.settings.RevealMap ? "Yes" : "No");
 			victoryConditionText.caption = "Victory condition: " + (g_GameAttributes.settings.GameType && g_GameAttributes.settings.GameType == "endless"  ?  "None" : "Conquest");
-			lockTeamsText.caption = "Teams locked: " + (g_GameAttributes.settings.LockTeams ? "Yes" : "No");
+			lockTeamsText.caption = "Teams locked: " + (g_GameAttributes.settings.LockTeams === undefined || g_GameAttributes.settings.LockTeams ? "Yes" : "No");
 		}
 		
 		break;
@@ -661,10 +661,10 @@ function onGameAttributesChange()
 		victoryCondition.hidden = true;
 		lockTeams.hidden = true;
 		
-		mapSizeText.caption = "Map size: n/a";
+		mapSizeText.caption = "Map size: Default";
 		revealMapText.caption = "Reveal map: " + (mapSettings.RevealMap ? "Yes" : "No");
 		victoryConditionText.caption = "Victory condition: " + (mapSettings.GameType && mapSettings.GameType == "endless"  ?  "None" : "Conquest");
-		lockTeamsText.caption = "Teams locked: " + (mapSettings.LockTeams ? "Yes" : "No");
+		lockTeamsText.caption = "Teams locked: " + (mapSettings.LockTeams === undefined || mapSettings.LockTeams  ? "Yes" : "No");
 		
 		break;
 		
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 39aa538c38..092fb6f213 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -117,15 +117,15 @@
 		
 		<object name="gameOptionsBox" size="260 100%-260 100% 100%-190">
 			<object size="2 2 100% 50%-2">	<!-- Top row -->
-				<object name="mapSizeText" size="0 0 175 100%" type="text">Map size: n/a</object>
+				<object name="mapSizeText" size="0 0 175 100%" type="text">Map size:</object>
 				<object name="mapSize" size="75 -2 175 100%-6" type="dropdown" style="wheatDropDown" hidden="true"/>
-				<object name="victoryConditionText" size="195 0 450 100%" type="text">Victory condition: </object>
+				<object name="victoryConditionText" size="195 0 450 100%" type="text">Victory condition:</object>
 				<object name="victoryCondition" size="325 -2 450 100%-6" type="dropdown" style="wheatDropDown" hidden="true"/>
 			</object>
 			<object size="2 50%+2 100% 100%"> 	<!-- Bottom row -->
-				<object name="revealMapText" size="0 0 120 100%" type="text">Reveal map: </object>
+				<object name="revealMapText" size="0 0 120 100%" type="text">Reveal map:</object>
 				<object name="revealMap" size="100 2 120 100%" type="checkbox" style="wheatCrossBox" hidden="true"/>
-				<object name="lockTeamsText" size="140 0 280 100%" type="text">Teams locked: </object>
+				<object name="lockTeamsText" size="195 0 450 100%" type="text">Teams locked:</object>
 				<object name="lockTeams" size="260 2 280 100%" type="checkbox" style="wheatCrossBox" hidden="true"/>
 			</object>
 		</object>
diff --git a/binaries/data/mods/public/maps/scenarios/Saharan Oases.xml b/binaries/data/mods/public/maps/scenarios/Saharan Oases.xml
index 07ff3eba71..2a4ce80ffc 100644
--- a/binaries/data/mods/public/maps/scenarios/Saharan Oases.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Saharan Oases.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8db00c01a2621d8d46c5f2655cedc2f444a8d200b9dea314d697bfb21e92b84
+oid sha256:a963ba3854a2e418f5194914d2220a2643e74e9a7d0c97b72119e56366717905
 size 442275