diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index a83f23b2..767f5729 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2531,8 +2531,8 @@ static void Command_Teamchange_f(void)
 		return;
 	}
 
-	if (players[consoleplayer].spectator && !(players[consoleplayer].pflags & PF_WANTSTOJOIN) && !NetPacket.packet.newteam)
-		error = true;
+	if (players[consoleplayer].spectator && !NetPacket.packet.newteam)
+		error = !(players[consoleplayer].pflags & PF_WANTSTOJOIN);
 	else if (G_GametypeHasTeams() && NetPacket.packet.newteam == (unsigned)players[consoleplayer].ctfteam)
 		error = true;
 	else if (G_GametypeHasSpectators() && !players[consoleplayer].spectator && NetPacket.packet.newteam == 3)
@@ -2622,8 +2622,8 @@ static void Command_Teamchange2_f(void)
 		return;
 	}
 
-	if (players[secondarydisplayplayer].spectator && !(players[secondarydisplayplayer].pflags & PF_WANTSTOJOIN) && !NetPacket.packet.newteam)
-		error = true;
+	if (players[secondarydisplayplayer].spectator && !NetPacket.packet.newteam)
+		error = !(players[secondarydisplayplayer].pflags & PF_WANTSTOJOIN);
 	else if (G_GametypeHasTeams() && NetPacket.packet.newteam == (unsigned)players[secondarydisplayplayer].ctfteam)
 		error = true;
 	else if (G_GametypeHasSpectators() && !players[secondarydisplayplayer].spectator && NetPacket.packet.newteam == 3)
@@ -2713,8 +2713,8 @@ static void Command_Teamchange3_f(void)
 		return;
 	}
 
-	if (players[thirddisplayplayer].spectator && !(players[thirddisplayplayer].pflags & PF_WANTSTOJOIN) && !NetPacket.packet.newteam)
-		error = true;
+	if (players[thirddisplayplayer].spectator && !NetPacket.packet.newteam)
+		error = !(players[thirddisplayplayer].pflags & PF_WANTSTOJOIN);
 	else if (G_GametypeHasTeams() && NetPacket.packet.newteam == (unsigned)players[thirddisplayplayer].ctfteam)
 		error = true;
 	else if (G_GametypeHasSpectators() && !players[thirddisplayplayer].spectator && NetPacket.packet.newteam == 3)
@@ -2804,8 +2804,8 @@ static void Command_Teamchange4_f(void)
 		return;
 	}
 
-	if (players[fourthdisplayplayer].spectator && !(players[fourthdisplayplayer].pflags & PF_WANTSTOJOIN) && !NetPacket.packet.newteam)
-		error = true;
+	if (players[fourthdisplayplayer].spectator && !NetPacket.packet.newteam)
+		error = !(players[fourthdisplayplayer].pflags & PF_WANTSTOJOIN);
 	else if (G_GametypeHasTeams() && NetPacket.packet.newteam == (unsigned)players[fourthdisplayplayer].ctfteam)
 		error = true;
 	else if (G_GametypeHasSpectators() && !players[fourthdisplayplayer].spectator && NetPacket.packet.newteam == 3)