Index: src/game/g_cmds.c
===================================================================
--- src/game/g_cmds.c	(revision 809)
+++ src/game/g_cmds.c	(working copy)
@@ -693,6 +693,9 @@
     return;
   }
 
+  if( ent->client->pers.teamSelection == team )
+    return;
+
   G_ChangeTeam( ent, team );
 
   if( team == PTE_ALIENS )