diff --git a/loginserver/database.cpp b/loginserver/database.cpp
index 523994148..dc7367049 100644
--- a/loginserver/database.cpp
+++ b/loginserver/database.cpp
@@ -340,7 +340,7 @@ Database::DbWorldRegistration Database::GetWorldRegistration(
 		"  login_world_servers AS WSR\n"
 		"  JOIN login_server_list_types AS SLT ON WSR.login_server_list_type_id = SLT.id\n"
 		"WHERE\n"
-		"  WSR.short_name = '{0}' WSR.login_server_admin_id = {1} AND LIMIT 1",
+		"  WSR.short_name = '{0}' AND WSR.login_server_admin_id = {1} AND LIMIT 1",
 		EscapeString(short_name),
 		login_world_server_admin_id
 	);