diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs
index 173bd0e..86d2667 100644
--- a/Classic/prefs/serverPrefs.cs
+++ b/Classic/prefs/serverPrefs.cs
@@ -64,6 +64,7 @@ $Host::EmptyServerReset = 1;
 $Host::EmptyServerResetTime = 120;
 $Host::EnableAutobalance = 1;
 $Host::EnableLakUnlimitedDJ = 1;
+$Host::EnableMapRepetitionChecker = 1;
 $Host::EnableMortarTurret = 0;
 $Host::EnableNoBaseRapeNotify = 1;
 $Host::EnableNetTourneyClient = 0;
diff --git a/Classic/scripts/autoexec/MapRepetitionChecker.cs b/Classic/scripts/autoexec/MapRepetitionChecker.cs
index 435d0f9..58623c6 100644
--- a/Classic/scripts/autoexec/MapRepetitionChecker.cs
+++ b/Classic/scripts/autoexec/MapRepetitionChecker.cs
@@ -21,36 +21,39 @@ $PreviousMission1back = "";
 //Ran in MissionTypeOptions.cs
 function MapRepetitionChecker( %game )
 {
-	//Debug
-	//%MapRepetitionCheckerDebug = true;
-		
-	if(!$GetRandomMapsLoaded) //Make sure GetRandomMaps.cs is present
-		return;
-		
-	if($EvoCachedNextMission $= "")
-		return;
-	
-	if(!$Host::TournamentMode)
-	{	
-		//Do work
-		if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission || 
-			$PreviousMission3back $= $EvoCachedNextMission || $PreviousMission4back $= $EvoCachedNextMission ||
-			$CurrentMission $= $EvoCachedNextMission )
-			MapRepetitionCheckerFindRandom();
-			
-		//Set vars	
-		if($PreviousMission3back !$= "") $PreviousMission4back = $PreviousMission3back;
-		if($PreviousMission2back !$= "") $PreviousMission3back = $PreviousMission2back;		
-		if($PreviousMission1back !$= "") $PreviousMission2back = $PreviousMission1back;
-										 $PreviousMission1back = $CurrentMission;
-				
+	if($Host::EnableMapRepetitionChecker)
+	{
 		//Debug
-		if(%MapRepetitionCheckerDebug)	
-		{
-			if($PreviousMission1back !$= "") echo("PM1: " @ $PreviousMission1back);
-			if($PreviousMission2back !$= "") echo("PM2: " @ $PreviousMission2back);
-			if($PreviousMission3back !$= "") echo("PM3: " @ $PreviousMission3back);
-			if($PreviousMission4back !$= "") echo("PM4: " @ $PreviousMission4back);
+		//%MapRepetitionCheckerDebug = true;
+			
+		if(!$GetRandomMapsLoaded) //Make sure GetRandomMaps.cs is present
+			return;
+			
+		if($EvoCachedNextMission $= "")
+			return;
+		
+		if(!$Host::TournamentMode)
+		{	
+			//Do work
+			if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission || 
+				$PreviousMission3back $= $EvoCachedNextMission || $PreviousMission4back $= $EvoCachedNextMission ||
+				$CurrentMission $= $EvoCachedNextMission )
+				MapRepetitionCheckerFindRandom();
+				
+			//Set vars	
+			if($PreviousMission3back !$= "") $PreviousMission4back = $PreviousMission3back;
+			if($PreviousMission2back !$= "") $PreviousMission3back = $PreviousMission2back;		
+			if($PreviousMission1back !$= "") $PreviousMission2back = $PreviousMission1back;
+											 $PreviousMission1back = $CurrentMission;
+					
+			//Debug
+			if(%MapRepetitionCheckerDebug)	
+			{
+				if($PreviousMission1back !$= "") echo("PM1: " @ $PreviousMission1back);
+				if($PreviousMission2back !$= "") echo("PM2: " @ $PreviousMission2back);
+				if($PreviousMission3back !$= "") echo("PM3: " @ $PreviousMission3back);
+				if($PreviousMission4back !$= "") echo("PM4: " @ $PreviousMission4back);
+			}
 		}
 	}
 }
diff --git a/Classic/scripts/serverDefaults.cs b/Classic/scripts/serverDefaults.cs
index 141cbca..eaa00d0 100644
--- a/Classic/scripts/serverDefaults.cs
+++ b/Classic/scripts/serverDefaults.cs
@@ -180,6 +180,7 @@ $Host::MapPlayerLimits["Whiteout", "Bounty"] = "8 -1";
 $Host::EmptyServerReset = 1;					//To control whether the server auto resets when empty
 $Host::EmptyServerResetTime = 120;				//Time in Minutes to reset an empty server
 $Host::EnableAutobalance = 1;					//Will autobalance when teams are uneven.
+$Host::EnableMapRepetitionChecker = 1;			//Enable or Disable the Map Repetition Checker
 $Host::EnableMortarTurret = 0; 					//Enable or Disable Mortar Turret
 $Host::EnableNetTourneyClient = 1; 				//Enable or Disable Tourney Net Client checking
 $Host::EnableNoBaseRapeNotify = 1; 				//Get a base rape notification
@@ -191,6 +192,7 @@ $Host::AntiCloakEnable = 1; 					//Enable or disable AntiCloak
 $Host::AntiCloakPlayerCount = 6; 				//How many to enable Cloak
 $Host::PUGautoPassword = 0; 					//Auto enable a password in tournament mode
 $Host::PUGPassword = "pickup"; 					//PUG password, Auto or enable/disable thru admin menu
+$Host::PUGpasswordAlwaysOn = 0;					//If you want the pug password Always on
 $Host::EmptyServerReset = 1;					//Whether or not you want the server to reset when its empty
 $Host::DMSLOnlyMode = 0;						//Shocklance Only Mode for Deathmatch
 $Host::SCtFProMode = 0;							//Pro mode for LCTF
@@ -214,7 +216,7 @@ $Host::LoadScreenMOTD1 = "Blaster is here to stay!";								//MOTD or Events Lin
 $Host::LoadScreenMOTD2 = "Come play Arena on Wednesday Nights!";					//MOTD or Events Line 2 Message (Debrief LoadScreen Only)
 $Host::LoadScreenMOTD3 = "Lak crowd early evenings after work during the week.";	//MOTD or Events Line 3 Message (Debrief LoadScreen Only)
 $Host::LoadScreenMOTD4 = "Big CTF games Fridays, Saturdays, and Sundays!";			//MOTD or Events Line 4 Message	(Debrief LoadScreen Only)
-$Host::EvoAdminSwitchTeams = 1;					//Enable or Disable an admins ability to switch other players teams.			
+$Host::EvoAdminSwitchTeams = 1;					//Enable or Disable an admins ability to switch other players teams.	
 //LakRabbit
 $Host::EnableLakUnlimitedDJ = 1;				//Unlimited disc-jumps if enabled
 $Host::LakRabbitNoSplashDamage = 0;				//Splash Damage enabled or not