diff --git a/client.qc b/client.qc
index 8f824d8..865171c 100644
--- a/client.qc
+++ b/client.qc
@@ -1811,6 +1811,12 @@ void() PutClientInServer =
 	local float iszoom, oldclass;
 	local entity spot, te;
 
+	local float in_classgen = FALSE;
+
+	if ((!self.done_custom || (self.done_custom & CUSTOM_ON_SPAWN)) && 
+	    (self.playerclass == PC_CUSTOM || self.nextpc == PC_CUSTOM))
+		in_classgen = TRUE;
+
 	self.fire_held_down = 0;
 	self.touch = player_touch;
 	self.classname = "player";
@@ -1929,14 +1935,12 @@ void() PutClientInServer =
 	if (iszoom == 1)
 		self.tfstate = self.tfstate | TFSTATE_ZOOMOFF;
 
-	// Display the Player's Class
-	if (!(self.done_custom == 0 || (self.done_custom & CUSTOM_ON_SPAWN)))
-	{
-		if (self.playerclass != PC_CUSTOM)
-			TeamFortress_PrintClassName(self,self.playerclass, (self.tfstate & TFSTATE_RANDOMPC));
-		else 
-			TeamFortress_PrintJobName(self,self.job);
-	}
+	// Display the Player's class
+	if (self.playerclass != PC_CUSTOM)
+		TeamFortress_PrintClassName(self, self.playerclass, (self.tfstate & TFSTATE_RANDOMPC));
+	else if (!in_classgen)
+		TeamFortress_PrintJobName(self,self.job);
+
 	// Set the weapons and ammo for the player based on class
 	TeamFortress_SetEquipment();
 	// Set the health for the player based on class
@@ -1953,7 +1957,16 @@ void() PutClientInServer =
 	stuffcmd(self, "-left;-right;cl_yawspeed 140\n");
 
 	//WK Again, since they could lose their sentrygun in SetEquip...
-	DetonateAllGuns();
+	if (!in_classgen)
+	{
+		DetonateAllGuns();
+		if (!(self.job & JOB_WARLOCK))
+			kill_my_demon();
+		if (!(self.job & JOB_GUERILLA))
+			DetonateMines(self);
+		if (!(self.job & JOB_ARMY))
+			RemoveArmyTimer();
+	}
 
 
 	SetTeamName(self);
@@ -1978,7 +1991,7 @@ void() PutClientInServer =
 	
 	spot = SelectSpawnPoint ();
 
-	if (self.playerclass != PC_UNDEFINED)
+	if (self.playerclass != PC_UNDEFINED && !in_classgen)
 		spawn_tdeath (spot.origin, self);
 
 	self.observer_list = spot;
@@ -2001,7 +2014,7 @@ void() PutClientInServer =
 
 	// If this is a TeamSpawnpoint, check to see if it
 	// gives out a GoalItem, or displays a message
-	if (spot.classname == "info_player_teamspawn")
+	if (spot.classname == "info_player_teamspawn" && self.playerclass != PC_UNDEFINED && !in_classgen)
 	{
 		if (spot.items != 0)
 		{
@@ -2062,7 +2075,7 @@ void() PutClientInServer =
 //WK Done_custom is initialized to 0, hackish yes.
 //There are two entries, unintialized 0, or a person having issued a 'custom' command
 //which sets the CUSTOM_ON_SPAWN flag
-		if (self.done_custom == 0 || (self.done_custom & CUSTOM_ON_SPAWN))
+		if (in_classgen)
 		{
 			DropToCustomClassGen();
 		}
@@ -2084,7 +2097,7 @@ void() PutClientInServer =
 	if (deathmatch || coop)
 	{
 		makevectors(self.angles);
-		if (self.playerclass != PC_UNDEFINED)
+		if (self.playerclass != PC_UNDEFINED && !in_classgen)
 			spawn_tfog (self.origin + v_forward*10);
 	}
 
@@ -2752,7 +2765,7 @@ void() PlayerPreThink =
 			local vector angle = self.angles;
 			angle_x = -angle_x;
 			makevectors(angle);
-			v_up = '0 0 1' // angle thing is broken for now
+			v_up = '0 0 1'; // angle thing is broken for now
 
 			self.hover_time = self.hover_time - 0.5; //0.1 == tick time
 			if (self.hover_time <= 0) {
diff --git a/custom.qc b/custom.qc
index 0bc41b9..81e900c 100644
--- a/custom.qc
+++ b/custom.qc
@@ -121,10 +121,6 @@ void() DropToCustomClassGen =
 	
     //st = infokey(NIL, "no_grapple");
 
-    kill_my_demon();//FIXED?
-	DetonateMines(self);
-    RemoveArmyTimer();
-
     self.aura = 0;
 
     //Remove everything he's carrying	
@@ -211,15 +207,6 @@ void() DropToCustomClassGen =
 	else
 		self.done_custom = CUSTOM_BUILDING; 
 	
-	//Destroy Buildings... again. :p
-	DetonateAllGuns();
-
-	//And then kill all demons I own
-	
-    //kill_my_demon();
-    //DetonateMines(self);
-    //RemoveArmyTimer();
-
       self.current_menu = MENU_PRIMARY_WEAPON;
       Menu_PrimaryWeapon();
 	return;
@@ -330,6 +317,23 @@ void() DropFromCustomClassGen =
 		    self.maxammo_cells = 320;
       }
       
+	// I don't know if it has to do with the "FRONTLIN HELI BUG FIX" but this shouldn't all be
+	// duped here. If this breaks something, tell me what
+	// -Griev
+
+#if 1
+	if (coop)
+		setspawnparms(self);
+	else
+		SetNewParms();
+
+	PutClientInServer();
+	TeamFortress_SetSpeed(self);
+
+	//GR - ofn hid this in the middle of code below, argh
+	ResetMenu();
+	self.impulse = 0;
+#else
 
 	//- OFN HERE FRONTLIN HELI BUG FIX ---//
     local entity spot;
@@ -408,7 +412,7 @@ void() DropFromCustomClassGen =
     {
         SetArmyTimer();
     }	
-	
+#endif // removed dup code	
 	return;
 };
 
diff --git a/tfort.qc b/tfort.qc
index 14361c6..1d07c29 100644
--- a/tfort.qc
+++ b/tfort.qc
@@ -158,8 +158,6 @@ void() UseSpecialSkill =
 // If self.impulse == 1, change to Civilian class
 void() TeamFortress_ChangeClass =
 {
-	local entity spot, te;
-
 	//WK - Handle Custom Class Restarting
 	if (self.playerclass == PC_CUSTOM
 		&& (self.done_custom & CUSTOM_BUILDING)) {
@@ -224,6 +222,22 @@ void() TeamFortress_ChangeClass =
 
 	self.nextpc = 0;
 
+#if 1
+	// Duplicated code again!
+	if (coop)
+		setspawnparms(self);
+	else
+		SetNewParms();
+
+	PutClientInServer();
+	TeamFortress_SetSpeed(self);
+
+	ResetMenu();
+	self.impulse = 0;
+
+#else
+	local entity spot, te;
+
 	// Turn off PC_UNDEFINED's nomove and invincibility
 	self.takedamage = DAMAGE_AIM;
 	//WK Prevent bad movetype errors, or something
@@ -338,6 +352,7 @@ void() TeamFortress_ChangeClass =
 		self.invincible_time = 1;
 		self.invincible_finished = time + RESPAWN_GUARD_TIME;
 	}
+#endif
 };
 
 //=========================================================================