diff --git a/src/net/clientthread.h b/src/net/clientthread.h
index 2a367bb3..33ea2529 100644
--- a/src/net/clientthread.h
+++ b/src/net/clientthread.h
@@ -242,6 +242,7 @@ friend class ClientStateStartServerListDownload;
 friend class ClientStateSynchronizingServerList;
 friend class ClientStateDownloadingServerList;
 friend class ClientStateReadingServerList;
+friend class ClientStateWaitChooseServer;
 friend class ClientStateStartConnect;
 friend class ClientStateConnecting;
 friend class ClientStateStartSession;
diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp
index 6437d2d2..11387078 100644
--- a/src/net/common/clientstate.cpp
+++ b/src/net/common/clientstate.cpp
@@ -544,9 +544,9 @@ ClientStateWaitChooseServer::Process(ClientThread &client)
 	int retVal = MSG_SOCK_INTERNAL_PENDING;
 
 	unsigned serverId;
-	if (client.GetSelectedServer(serverid))
+	if (client.GetSelectedServer(serverId))
 	{
-		client.UseServer(serverid);
+		client.UseServer(serverId);
 		client.SetState(ClientStateStartResolve::Instance());
 		retVal = MSG_SOCK_SERVER_LIST_DONE;
 	}