diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp
index 8f636443..80b56333 100644
--- a/src/net/common/serverlobbythread.cpp
+++ b/src/net/common/serverlobbythread.cpp
@@ -916,9 +916,10 @@ ServerLobbyThread::HandleNetPacketInit(SessionWrapper session, const InitMessage
 	string playerName;
 	MD5Buf avatarMD5;
 	bool guestUser = false;
-	if (initMessage.login.present == login_PR_anonymousLogin)
+	if (initMessage.login.present == login_PR_guestLogin)
 	{
-		playerName = "guest001"; // TODO
+		const GuestLogin_t *guestLogin = &initMessage.login.choice.guestLogin;
+		playerName = string((const char *)guestLogin->nickName.buf, guestLogin->nickName.size);
 		guestUser = true;
 	}
 	else if (initMessage.login.present == login_PR_authenticatedLogin)