Index: binaries/data/mods/public/gui/credits/texts/programming.json
===================================================================
--- binaries/data/mods/public/gui/credits/texts/programming.json	(revision 18368)
+++ binaries/data/mods/public/gui/credits/texts/programming.json	(working copy)
@@ -93,6 +93,7 @@
 			{"nick": "IronNerd", "name": "Matthew McMullan"},
 			{"nick": "Itms", "name": "Nicolas Auvray"},
 			{"nick": "Jaison", "name": "Marco tom Suden"},
+			{"name": "Jared Ryan Bills"},
 			{"nick": "jammus", "name": "James Scott"},
 			{"nick": "Jgwman"},
 			{"nick": "JonBaer", "name": "Jon Baer"},
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.js	(revision 18368)
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.js	(working copy)
@@ -1163,6 +1163,15 @@
 		delete g_GameAttributes.settings.LastManStanding;
 	}
 
+	//Set the player data to the last player data if not on random or scenario map types
+	if(g_GameAttributes.mapType != "random" && g_GameAttributes.mapType != "scenario")
+	{
+		let currentPlayerData = g_GameAttributes.settings.PlayerData;
+		let cDataSize = currentPlayerData.length;
+		let pDataSize = mapSettings.PlayerData.length;
+		mapSettings.PlayerData = (pDataSize > cDataSize ? currentPlayerData.concat(mapSettings.PlayerData.slice(cDataSize)) : currentPlayerData.slice(0, pDataSize));
+	}
+
 	if (mapSettings.PlayerData)
 		sanitizePlayerData(mapSettings.PlayerData);