diff --git a/loginserver/account_management.cpp b/loginserver/account_management.cpp
index 8100ff467..2ac3c07b5 100644
--- a/loginserver/account_management.cpp
+++ b/loginserver/account_management.cpp
@@ -105,19 +105,22 @@ bool AccountManagement::CreateLoginserverWorldAdminAccount(
 		return false;
 	}
 
-	if (server.db->CreateLoginserverWorldAdminAccount(
+	uint32 created_world_admin_id = server.db->CreateLoginserverWorldAdminAccount(
 		username,
 		hash,
 		first_name,
 		last_name,
 		email,
 		ip_address
-	)) {
+	);
+
+	if (created_world_admin_id > 0) {
 		LogInfo(
-			"Account creation success for user [{0}] encryption algorithm [{1}] ({2})",
+			"Account creation success for user [{0}] encryption algorithm [{1}] ({2}) new admin id [{3}]",
 			username,
 			GetEncryptionByModeId(mode),
-			mode
+			mode,
+			created_world_admin_id
 		);
 		return true;
 	}
diff --git a/loginserver/database.cpp b/loginserver/database.cpp
index 09d0431f3..6437cc1ec 100644
--- a/loginserver/database.cpp
+++ b/loginserver/database.cpp
@@ -622,7 +622,7 @@ void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
  * @param ip_address
  * @return
  */
-bool Database::CreateLoginserverWorldAdminAccount(
+uint32 Database::CreateLoginserverWorldAdminAccount(
 	const std::string &account_name,
 	const std::string &account_password,
 	const std::string &first_name,
@@ -645,7 +645,7 @@ bool Database::CreateLoginserverWorldAdminAccount(
 
 	auto results = QueryDatabase(query);
 
-	return results.Success();
+	return (results.Success() ? results.LastInsertedID() : 0);
 }
 
 /**
diff --git a/loginserver/database.h b/loginserver/database.h
index d9cafca4a..816a008d3 100644
--- a/loginserver/database.h
+++ b/loginserver/database.h
@@ -221,7 +221,7 @@ public:
 	 * @param ip_address
 	 * @return
 	 */
-	bool CreateLoginserverWorldAdminAccount(
+	uint32 CreateLoginserverWorldAdminAccount(
 		const std::string &account_name,
 		const std::string &account_password,
 		const std::string &first_name,
diff --git a/loginserver/loginserver_command_handler.cpp b/loginserver/loginserver_command_handler.cpp
index 52b1928fc..3337a52e9 100644
--- a/loginserver/loginserver_command_handler.cpp
+++ b/loginserver/loginserver_command_handler.cpp
@@ -71,10 +71,10 @@ namespace LoginserverCommandHandler {
 		 */
 		std::map<std::string, void (*)(int argc, char **argv, argh::parser &cmd)> function_map;
 
-		function_map["create-loginserver-api-token"]           = &LoginserverCommandHandler::CreateLoginserverApiToken;
-		function_map["list-loginserver-api-tokens"]            = &LoginserverCommandHandler::ListLoginserverApiTokens;
 		function_map["create-loginserver-account"]             = &LoginserverCommandHandler::CreateLocalLoginserverAccount;
+		function_map["create-loginserver-api-token"]           = &LoginserverCommandHandler::CreateLoginserverApiToken;
 		function_map["create-loginserver-world-admin-account"] = &LoginserverCommandHandler::CreateLoginserverWorldAdminAccount;
+		function_map["list-loginserver-api-tokens"]            = &LoginserverCommandHandler::ListLoginserverApiTokens;
 
 		std::map<std::string, void (*)(
 			int argc,
@@ -153,14 +153,12 @@ namespace LoginserverCommandHandler {
 	 */
 	void ListLoginserverApiTokens(int argc, char **argv, argh::parser &cmd)
 	{
-		for (auto it = server.token_manager->loaded_api_tokens.begin();
-			it != server.token_manager->loaded_api_tokens.end();
-			++it) {
+		for (auto &it : server.token_manager->loaded_api_tokens) {
 			LogInfo(
 				"token [{0}] can_write [{1}] can_read [{2}]",
-				it->second.token,
-				it->second.can_write,
-				it->second.can_read
+				it.second.token,
+				it.second.can_write,
+				it.second.can_read
 			);
 		}
 	}
@@ -177,7 +175,10 @@ namespace LoginserverCommandHandler {
 			exit(1);
 		}
 
-		AccountManagement::CreateLocalLoginServerAccount(cmd("--username").str(), cmd("--password").str());
+		AccountManagement::CreateLocalLoginServerAccount(
+			cmd("--username").str(),
+			cmd("--password").str()
+		);
 	}
 
 	/**