Index: binaries/data/mods/public/gui/common/gamedescription.js
===================================================================
--- binaries/data/mods/public/gui/common/gamedescription.js
+++ binaries/data/mods/public/gui/common/gamedescription.js
@@ -400,16 +400,20 @@
 				translate("Players start with a Civic Center.")
 	});
 
-	titles.push({
-		"label": translate("Starting Resources"),
-		"value": sprintf(translate("%(startingResourcesTitle)s (%(amount)s)"), {
-			"startingResourcesTitle":
-				g_StartingResources.Title[
-					g_StartingResources.Resources.indexOf(
-						g_GameAttributes.settings.StartingResources)],
-			"amount": g_GameAttributes.settings.StartingResources
-		})
-	});
+	// Starting Resource settings will be ignored for scenarios on game initialization
+	if (g_GameAttributes.mapType != "scenario")
+	{
+		titles.push({
+			"label": translate("Starting Resources"),
+			"value": sprintf(translate("%(startingResourcesTitle)s (%(amount)s)"), {
+				"startingResourcesTitle":
+					g_StartingResources.Title[
+						g_StartingResources.Resources.indexOf(
+							g_GameAttributes.settings.StartingResources)],
+				"amount": g_GameAttributes.settings.StartingResources
+			})
+		});
+	}
 
 	titles.push({
 		"label": translate("Population Limit"),
Index: binaries/data/mods/public/gui/credits/texts/programming.json
===================================================================
--- binaries/data/mods/public/gui/credits/texts/programming.json
+++ binaries/data/mods/public/gui/credits/texts/programming.json
@@ -235,6 +235,7 @@
 			{"nick": "vts", "name": "Jeroen DR"},
 			{"nick": "WhiteTreePaladin", "name": "Brian Ashley"},
 			{"nick": "wraitii", "name": "Lancelot de Ferrière le Vayer"},
+			{"nick": "Wundersam", "name": "J. R."},
 			{"nick": "Xentelian", "name": "Mark Strawson"},
 			{"nick": "Xienen", "name": "Dayle Flowers"},
 			{"nick": "xtizer", "name": "Matt Green"},
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
@@ -603,7 +603,7 @@
 		"select": (itemIdx) => {
 			g_GameAttributes.settings.PopulationCap = g_PopulationCapacities.Population[itemIdx];
 		},
-		"enabled": () => g_GameAttributes.mapType != "scenario",
+		"enabled": () => true,
 		"initOrder": 1000
 	},
 	"startingResources": {