diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h
--- a/src/network/core/tcp_game.h
+++ b/src/network/core/tcp_game.h
@@ -35,8 +35,10 @@ enum {
 	PACKET_CLIENT_COMPANY_INFO,
 	PACKET_SERVER_COMPANY_INFO,
 	PACKET_SERVER_CLIENT_INFO,
-	PACKET_SERVER_NEED_PASSWORD,
-	PACKET_CLIENT_PASSWORD,
+	PACKET_SERVER_NEED_GAME_PASSWORD,
+	PACKET_SERVER_NEED_COMPANY_PASSWORD,
+	PACKET_CLIENT_GAME_PASSWORD,
+	PACKET_CLIENT_COMPANY_PASSWORD,
 	PACKET_SERVER_WELCOME,
 	PACKET_CLIENT_GETMAP,
 	PACKET_SERVER_WAIT,
@@ -75,7 +77,8 @@ struct CommandPacket;
 /** Status of a client */
 enum ClientStatus {
 	STATUS_INACTIVE,   ///< The client is not connected nor active
-	STATUS_AUTHORIZING,///< The client is authorizing
+	STATUS_AUTH_GAME,  ///< The client is authorizing with game (server) password
+	STATUS_AUTH_COMPANY, ///< The client is authorizing with company password
 	STATUS_AUTH,       ///< The client is authorized
 	STATUS_MAP_WAIT,   ///< The client is waiting as someone else is downloading the map
 	STATUS_MAP,        ///< The client is downloading the map