diff --git a/Classic/scripts/autoexec/altWarmup.cs b/Classic/scripts/autoexec/altWarmup.cs
index c4f7b69..bd79cc1 100644
--- a/Classic/scripts/autoexec/altWarmup.cs
+++ b/Classic/scripts/autoexec/altWarmup.cs
@@ -21,13 +21,11 @@ function DefaultGame::setupClientTeams(%game)
 {
    $Host::warmupTime = $AW::DefaultWarmUpTime;
    if($HostGamePlayerCount >= $AW::MinALTWarmUpPop && $AW::EnableALTWarmUp && ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF"))
-   {
 	   %altWarmup = 1;
-	   $Host::warmupTime = $AW::ALTWarmUpTime;
-   }
    
    if(%altWarmup)
    {
+	   $Host::warmupTime = $AW::ALTWarmUpTime;
 	   for(%i = 0; %i < ClientGroup.getCount(); %i ++) 
 	   {
 		  %client = ClientGroup.getObject(%i);
@@ -56,6 +54,7 @@ function serverCmdClientJoinTeam(%client, %team, %admin)
       else
          %team = 1;
    }
+   
    if(isObject(Game) && Game.kickClient != %client)
    {
       if(%client.team != %team)