diff --git a/Classic/scripts/autoexec/MissionTypeOptions.cs b/Classic/scripts/autoexec/MissionTypeOptions.cs
index ae7e8c4..0515b6c 100644
--- a/Classic/scripts/autoexec/MissionTypeOptions.cs
+++ b/Classic/scripts/autoexec/MissionTypeOptions.cs
@@ -48,10 +48,6 @@ function loadMissionStage2()
 		$Host::NoBaseRapeEnabled = 0;
 	else
 		$Host::NoBaseRapeEnabled = 1;
-	
-    //Reset IFF Colors
-	if($IFFColors)
-		$IFFColors = 0;
    
     parent::loadMissionStage2();
 }
diff --git a/Classic/scripts/autoexec/VoteMenu.cs b/Classic/scripts/autoexec/VoteMenu.cs
index 05c0abe..d33190c 100644
--- a/Classic/scripts/autoexec/VoteMenu.cs
+++ b/Classic/scripts/autoexec/VoteMenu.cs
@@ -705,6 +705,11 @@ function DefaultGame::gameOver(%game)
 
 	//Reset ClassicMaxMapChangeVotes
 	deleteVariables("$CMHasVoted*"); // Eolk - let people who have voted vote again
+	
+	//Reset IFF Colors
+	if($IFFColors)
+		$IFFColors = 0;
+
 }
 
 function DefaultGame::cancelMatchStart(%game, %admin)