diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs
index 961168c..13f71ac 100644
--- a/Classic/prefs/serverPrefs.cs
+++ b/Classic/prefs/serverPrefs.cs
@@ -1304,4 +1304,5 @@ $Host::EnableNoBaseRapeNotify = 1;
 $Host::EnableTeamBalanceNotify = 1;
 $Host::EnableTurretPlayerCount = 10;
 $Host::AntiCloakEnable = 1;
-$Host::AntiCloakPlayerCount = 6;
\ No newline at end of file
+$Host::AntiCloakPlayerCount = 6;
+$Host::EmptyServerReset = 0;
\ No newline at end of file
diff --git a/Classic/scripts/autoexec/GetTeamCounts.cs b/Classic/scripts/autoexec/GetTeamCounts.cs
index 8d59c1b..8dc4f2b 100644
--- a/Classic/scripts/autoexec/GetTeamCounts.cs
+++ b/Classic/scripts/autoexec/GetTeamCounts.cs
@@ -1,5 +1,8 @@
 //This function is Called at:
 //CreateServer(%mission, %missionType) in Server.cs
+//
+//To control whether the server auto resets when empty
+//$Host::EmptyServerReset = 0;
 
 package StartTeamCounts {
 
@@ -12,7 +15,7 @@ function CreateServer(%mission, %missionType)
 	//Make sure our activation variable is set
 	ResetClientChangedTeams();
 	//Keeps server Auto Reset off
-	$Host::Dedicated = 0;
+	$Host::Dedicated = $Host::EmptyServerReset;
 	//Call for a GetTeamCount update
 	GetTeamCounts( %game, %client, %respawn );
 
@@ -62,7 +65,7 @@ function GetTeamCounts( %game, %client, %respawn )
 			
 		
 			//Start Base Rape Notify
-			PlayerNotify::AtSpawn( %game, %client, %respawn );
+			NBRStatusNotify( %game, %client, %respawn );
 
 			//Call Team Balance Notify
 			TeamBalanceNotify::AtSpawn( %game, %client, %respawn );
diff --git a/Classic/scripts/serverDefaults.cs b/Classic/scripts/serverDefaults.cs
index 9b7dabc..2ed729b 100644
--- a/Classic/scripts/serverDefaults.cs
+++ b/Classic/scripts/serverDefaults.cs
@@ -189,3 +189,4 @@ $Host::Discord = "https://www.Discordapp.com/"; //Your discord
 $Host::PUGautoPassword = 0; 					//Enable or Disable an auto password at a certain amount of players
 $Host::PUGautoPasswordLimit = 10; 				//How many to enable a pug password
 $Host::PUGPassword = "pickup"; 					//pug password
+$Host::EmptyServerReset = 1;					//Whether or not you want the server to reset when its empty