diff --git a/loginserver/client.h b/loginserver/client.h
index d52c26f75..d95b3c286 100644
--- a/loginserver/client.h
+++ b/loginserver/client.h
@@ -191,7 +191,7 @@ public:
 	);
 
 	void DoSuccessfulLogin(const std::string in_account_name, int db_account_id, const std::string &db_loginserver);
-	void CreateLocalAccount(const std::string &user, const std::string &pass);
+	void CreateLocalAccount(const std::string &username, const std::string &password);
 	void CreateEQEmuAccount(const std::string &in_account_name, const std::string &in_account_password, unsigned int loginserver_account_id);
 
 private:
diff --git a/loginserver/world_server.cpp b/loginserver/world_server.cpp
index 800bbff4b..3022de53c 100644
--- a/loginserver/world_server.cpp
+++ b/loginserver/world_server.cpp
@@ -534,7 +534,7 @@ void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct *new_world_server_info
 	server.db->UpdateWorldRegistration(
 		GetServerId(),
 		GetServerLongName(),
-		GetConnection()->Handle()->RemoteIP()
+		GetRemoteIp()
 	);
 }