diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs
index f8e3a32..173bd0e 100644
--- a/Classic/prefs/serverPrefs.cs
+++ b/Classic/prefs/serverPrefs.cs
@@ -1441,6 +1441,7 @@ $Host::PlayerRespawnTimeout = 60;
 $Host::Port = 28000;
 $Host::PUGautoPassword = 0;
 $Host::PUGPassword = "pickup";
+$Host::PUGpasswordAlwaysOn = 0;
 $Host::PureServer = 0;
 $Host::SCtFProMode = 0;
 $Host::ShowEndingPlayerScores = 1;
diff --git a/Classic/scripts/autoexec/MissionTypeOptions.cs b/Classic/scripts/autoexec/MissionTypeOptions.cs
index 32baadc..7972e8b 100644
--- a/Classic/scripts/autoexec/MissionTypeOptions.cs
+++ b/Classic/scripts/autoexec/MissionTypeOptions.cs
@@ -9,7 +9,8 @@
 // $Host::PUGautoPassword = 1;
 // The PUG password you want
 // $Host::PUGPassword = "pickup";
-//
+// PUG Password is always on no matter what
+// $Host::$PUGpasswordAlwaysOn = 1;
 
 package MissionTypeOptions
 {
@@ -35,6 +36,9 @@ function loadMissionStage2()
 		$Host::HiVisibility = "1";
 	}
 	
+	if( $Host::PUGpasswordAlwaysOn )
+		$Host::Password = $Host::PUGPassword;
+	
 	//Start MapRepetitionChecker
 	schedule(20000, 0, "MapRepetitionChecker", %game);