diff --git a/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.h b/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.h
index 8c817183..7d5edc42 100755
--- a/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.h
+++ b/engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.h
@@ -68,9 +68,9 @@ public:
         int connectionServerNumber;
         int fakeBuddyPoints;
 
+	bool useOldSuidGenerator;
 
         const char *altPublicBindAddress;
-        const bool useOldSuidGenerator;
     };
 
 
diff --git a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp
index 8cea9927..7ed0c7a9 100755
--- a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp
+++ b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp
@@ -256,10 +256,10 @@ void ClientConnection::validateClient(const std::string &id, const std::string &
                 if (parent_id != child_id) {
                     DatabaseConnection::getInstance().upsertAccountRelationship(parent_id, child_id);
                 }
+            } else {
+            	WARNING(true, ("Login API returned empty child account(s)."));
             }
-        } else {
-            WARNING(true, ("Login API returned empty child account(s)."));
-        }
+	}
     }
 
     LOG("LoginClientConnection", ("validateClient() for stationId (%i) at IP (%s), id (%s)", user_id, getRemoteAddress().c_str(), uname.c_str()));
diff --git a/engine/server/application/LoginServer/src/shared/ConfigLoginServer.h b/engine/server/application/LoginServer/src/shared/ConfigLoginServer.h
index 888a693c..484071f6 100755
--- a/engine/server/application/LoginServer/src/shared/ConfigLoginServer.h
+++ b/engine/server/application/LoginServer/src/shared/ConfigLoginServer.h
@@ -134,6 +134,7 @@ class ConfigLoginServer
 
 	static bool	        getUseExternalAuth();
 	static const char * getExternalAuthUrl();
+	static bool	    getUseOldSuidGenerator();
 
 	// has character creation for this cluster been disabled through config option
 	static bool         isCharacterCreationDisabled(std::string const & cluster);
@@ -487,7 +488,7 @@ inline const char * ConfigLoginServer::getExternalAuthUrl()
 }
 
 
-inline const bool ConfigLoginServer::getUseOldSuidGenerator()
+inline bool ConfigLoginServer::getUseOldSuidGenerator()
 {
     return data->useOldSuidGenerator;
 }