diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp
index 170b04b1..19d4dbba 100644
--- a/src/net/common/clientstate.cpp
+++ b/src/net/common/clientstate.cpp
@@ -1095,6 +1095,9 @@ ClientStateWaitEnterLogin::TimerLoop(const boost::system::error_code& ec, boost:
 				OCTET_STRING_fromBuf(&guestLogin->nickName,
 									 context.GetPlayerName().c_str(),
 									 context.GetPlayerName().length());
+
+				client->GetSender().Send(context.GetSessionData(), init);
+				client->SetState(ClientStateWaitSession::Instance());
 			}
 			// If the player is not a guest, authenticate.
 			else
@@ -1125,10 +1128,9 @@ ClientStateWaitEnterLogin::TimerLoop(const boost::system::error_code& ec, boost:
 									MD5_DATA_SIZE);
 					}
 				}
+				client->GetSender().Send(context.GetSessionData(), init);
+				client->SetState(ClientStateWaitAuthChallenge::Instance());
 			}
-
-			client->GetSender().Send(context.GetSessionData(), init);
-			client->SetState(ClientStateWaitAuthChallenge::Instance());
 		}
 		else
 		{
diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp
index f6ba867c..abc5d39e 100644
--- a/src/net/common/serverlobbythread.cpp
+++ b/src/net/common/serverlobbythread.cpp
@@ -59,7 +59,7 @@
 
 #define SERVER_INIT_AVATAR_CLIENT_LOCK_SEC			30      // Forbid a client to send an additional avatar.
 
-#define SERVER_INIT_SESSION_TIMEOUT_SEC				20
+#define SERVER_INIT_SESSION_TIMEOUT_SEC				60
 #define SERVER_TIMEOUT_WARNING_REMAINING_SEC		60
 #define SERVER_SESSION_ACTIVITY_TIMEOUT_SEC			1800	// 30 min, MUST be > SERVER_TIMEOUT_WARNING_REMAINING_SEC
 #define SERVER_SESSION_FORCED_TIMEOUT_SEC			86400	// 1 day, should be quite large.