diff --git a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
index 21af7631..1f31a950 100755
--- a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
+++ b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
@@ -396,11 +396,14 @@ void ClientConnection::handleClientIdMessage(const ClientIdMsg& msg)
 		}
 		else
 		{
-			m_suid = atoi(m_accountName.c_str());
-			if (m_suid == 0)
-			{
-				std::hash<std::string> h;
-				m_suid = h(m_accountName.c_str());
+			if (!m_suid) {
+				m_suid = atoi(m_accountName.c_str());
+				if (m_suid == 0)
+				{
+				
+					std::hash<std::string> h;
+					m_suid = h(m_accountName.c_str());
+				}
 			}
 			onValidateClient(m_suid, m_accountName, m_isSecure, nullptr, ConfigConnectionServer::getDefaultGameFeatures(), ConfigConnectionServer::getDefaultSubscriptionFeatures(), 0, 0, 0, 0, ConfigConnectionServer::getFakeBuddyPoints());
 		}
@@ -1462,7 +1465,7 @@ void ClientConnection::onCharacterValidated(bool isValid, const NetworkId &chara
 
 //------------------------------------------------------------------------------------------
 
-void ClientConnection::onValidateClient (uint32 suid, const std::string & username, bool secure, const char* id, const uint32 gameFeatures, const uint32 subscriptionFeatures, unsigned int entitlementTotalTime, unsigned int entitlementEntitledTime, unsigned int entitlementTotalTimeSinceLastLogin, unsigned int entitlementEntitledTimeSinceLastLogin, int buddyPoints)
+void ClientConnection::onValidateClient (StationId suid, const std::string & username, bool secure, const char* id, const uint32 gameFeatures, const uint32 subscriptionFeatures, unsigned int entitlementTotalTime, unsigned int entitlementEntitledTime, unsigned int entitlementTotalTimeSinceLastLogin, unsigned int entitlementEntitledTimeSinceLastLogin, int buddyPoints)
 {
 	UNREF(id);
 	m_sessionValidated = true;
diff --git a/engine/server/application/ConnectionServer/src/shared/ClientConnection.h b/engine/server/application/ConnectionServer/src/shared/ClientConnection.h
index a0184cec..384f41b6 100755
--- a/engine/server/application/ConnectionServer/src/shared/ClientConnection.h
+++ b/engine/server/application/ConnectionServer/src/shared/ClientConnection.h
@@ -91,7 +91,7 @@ public:
 
 	void                          handleGameServerForLoginMessage(uint32 serverId);
 	void                          onIdValidated(bool canLogin, bool canCreateRegularCharacter, bool canCreateJediCharacter, bool canSkipTutorial, std::vector<std::pair<NetworkId, std::string> > const & consumedRewardEvents, std::vector<std::pair<NetworkId, std::string> > const & claimedRewardItems);
-	void                          onValidateClient    (uint32 id, const std::string & username, bool, const char*, uint32 gameFeatures, uint32 subscriptionFeatures, unsigned int entitlementTotalTime, unsigned int entitlementEntitledTime, unsigned int entitlementTotalTimeSinceLastLogin, unsigned int entitlementEntitledTimeSinceLastLogin, int buddyPoints);
+	void                          onValidateClient    (StationId id, const std::string & username, bool, const char*, uint32 gameFeatures, uint32 subscriptionFeatures, unsigned int entitlementTotalTime, unsigned int entitlementEntitledTime, unsigned int entitlementTotalTimeSinceLastLogin, unsigned int entitlementEntitledTimeSinceLastLogin, int buddyPoints);
 	void                          onCharacterValidated(bool isValid, const NetworkId &character, const std::string &characterName, const NetworkId &container, const std::string &scene, const Vector &coordinates);
 	static std::string            describeAccount(const ClientConnection *);
 
diff --git a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp
index 41ac293c..1fc22180 100755
--- a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp
+++ b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp
@@ -194,8 +194,8 @@ void ClientConnection::validateClient(const std::string &id, const std::string &
                 parentAccount = api.getString("mainAccount");
                 childAccounts = api.getStringMap("subAccounts");
 
-		user_id = api.getNullableValue<int>("user_id");
-		parent_id = api.getNullableValue<int>("parent_id");
+		user_id = static_cast<StationId>(api.getNullableValue<int>("user_id"));
+		parent_id = static_cast<StationId>(api.getNullableValue<int>("parent_id"));
             } else {
                 std::string msg(api.getString("message"));
                 if (msg.empty()) {
@@ -227,7 +227,7 @@ void ClientConnection::validateClient(const std::string &id, const std::string &
 	}
 
         for (auto i : childAccounts) {
-	    StationId child_id = i.first;
+	    StationId child_id = static_cast<StationId>(i.first);
 	    std::string child(i.second);
 
        	    if (!child.empty()) {