Index: src/game/g_cmds.c
===================================================================
--- src/game/g_cmds.c	(revision 1081)
+++ src/game/g_cmds.c	(working copy)
@@ -2382,6 +2382,8 @@
           }
           VectorCopy( newOrigin, ent->s.pos.trBase );
           ent->client->ps.stats[ STAT_CLASS ] = PCL_HUMAN;
+          ent->client->pers.classSelection = PCL_HUMAN;
+          ent->client->ps.eFlags ^= EF_TELEPORT_BIT;
         }
 
         BG_RemoveUpgradeFromInventory( i, ent->client->ps.stats );