diff --git a/src/egs_login.erl b/src/egs_login.erl
index 3c0c467..1d206a8 100644
--- a/src/egs_login.erl
+++ b/src/egs_login.erl
@@ -43,16 +43,6 @@ cast(_Command, _Data, _State) ->
 %% Raw commands.
 %% @todo Move all of them to events.
 
-%% Game server info request handler.
-%% @todo Remove the dependency on network.hrl through configuration files.
-raw(16#0217, _Data, #state{socket=Socket, gid=GID}) ->
-	IP = ?GAME_IP,
-	Port = ?GAME_PORT,
-	Packet = << 16#02160300:32, 0:192, GID:32/little-unsigned-integer, 0:64, IP/binary, Port:32/little-unsigned-integer >>,
-	psu_proto:packet_send(Socket, Packet),
-	ssl:close(Socket),
-	closed;
-
 %% @doc Authentication request handler. Currently always succeed.
 %%      Use the temporary session ID as the GID for now.
 %%      Use username and password as a folder name for saving character data.
@@ -106,6 +96,16 @@ event({system_client_version_info, _Language, _Platform, Version}, #state{socket
 		closed
 	end;
 
+%% Game server info request handler.
+%% @todo Remove the dependency on network.hrl through configuration files.
+event(system_game_server_request, #state{socket=Socket, gid=GID}) ->
+	IP = ?GAME_IP,
+	Port = ?GAME_PORT,
+	Packet = << 16#02160300:32, 0:192, GID:32/little-unsigned-integer, 0:64, IP/binary, Port:32/little-unsigned-integer >>,
+	psu_proto:packet_send(Socket, Packet),
+	ssl:close(Socket),
+	closed;
+
 %% @doc Authenticate the user by pattern matching its saved state against the key received.
 %%      If the user is authenticated, send him the character flags list.
 %% @todo Remove the put calls when all the send_xxxx are moved out of psu_game and into psu_proto.
diff --git a/src/psu/psu_proto.erl b/src/psu/psu_proto.erl
index 240959f..7c563ba 100644
--- a/src/psu/psu_proto.erl
+++ b/src/psu/psu_proto.erl
@@ -241,6 +241,22 @@ parse(Size, 16#020d, Channel, Data) ->
 	?ASSERT_EQ(VarK, 0),
 	{system_key_auth_request, AuthGID, AuthKey};
 
+parse(Size, 16#0217, Channel, Data) ->
+	<< LID:16/little, VarA:16/little, VarB:32/little, VarC:32/little, VarD:32/little, VarE:32/little, VarF:32/little, VarG:32/little, VarH:32/little, VarI:32/little >> = Data,
+	?ASSERT_EQ(Size, 44),
+	?ASSERT_EQ(Channel, 2),
+	?ASSERT_EQ(LID, 16#ffff),
+	?ASSERT_EQ(VarA, 0),
+	?ASSERT_EQ(VarB, 0),
+	?ASSERT_EQ(VarC, 0),
+	?ASSERT_EQ(VarD, 0),
+	?ASSERT_EQ(VarE, 0),
+	?ASSERT_EQ(VarF, 0),
+	?ASSERT_EQ(VarG, 0),
+	?ASSERT_EQ(VarH, 0),
+	?ASSERT_EQ(VarI, 0),
+	system_game_server_request;
+
 parse(Size, 16#021c, Channel, Data) ->
 	<< _LID:16/little, VarA:16/little, VarB:32/little, VarC:32/little, VarD:32/little, VarE:32/little, VarF:32/little, VarG:32/little, VarH:32/little, VarI:32/little >> = Data,
 	?ASSERT_EQ(Size, 44),