diff --git a/mp/src/game/client/ff/hud/ff_hud_chat.cpp b/mp/src/game/client/ff/hud/ff_hud_chat.cpp
index 8f1ee46d..02164cd0 100644
--- a/mp/src/game/client/ff/hud/ff_hud_chat.cpp
+++ b/mp/src/game/client/ff/hud/ff_hud_chat.cpp
@@ -132,7 +132,7 @@ Color GetCustomClientColor(int iPlayerIndex, int iTeamIndex/* = -1*/)
 		if (!gr)
 			return GetDefaultChatColor();
 
-		if (iTeamIndex > 0) // prefer team index over player index
+		if (iTeamIndex >= 0) // prefer team index over player index
 			iTeam = iTeamIndex;
 		else if(iPlayerIndex > 0)
 			iTeam = gr->GetTeam(iPlayerIndex);
diff --git a/mp/src/game/client/ff/hud/ff_hud_menu.cpp b/mp/src/game/client/ff/hud/ff_hud_menu.cpp
index 102c6ff4..d6b8c67f 100644
--- a/mp/src/game/client/ff/hud/ff_hud_menu.cpp
+++ b/mp/src/game/client/ff/hud/ff_hud_menu.cpp
@@ -540,7 +540,7 @@ void CHudContextMenu::Display(bool state)
 		return;
 
 	// no.
-	if ( !pPlayer->IsAlive() && pPlayer->m_iHealth <= 0 )
+	if ( ( !pPlayer->IsAlive() && pPlayer->m_iHealth <= 0 ) || pPlayer->GetTeamNumber() == TEAM_SPECTATOR )
 		return;
 
 	// There is a menu and it's cancelling