Merge branch 'release/v0.5.2'

FAForever · Nov 21, 2016 · 98987e3 · 98987e3
2 parents f4c05f3 + 4d1e275
commit 98987e3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/server/lobbyconnection.py b/server/lobbyconnection.py
@@ -629,15 +629,17 @@ async def validate_unique_id(self, cursor, player_id, steamid, encoded_unique_id
             self.send_warning("Your computer is associated with too many FAF accounts.<br><br>In order to continue "
                               "using them, you have to link them to Steam: <a href='" +
                               config.APP_URL + "/faf/steam.php'>" +
-                              config.APP_URL + "/faf/steam.php</a><br>. For further assistance, please ", fatal=True)
+                              config.APP_URL + "/faf/steam.php</a>.<br>If you need an exception, please contact an "
+                                               "admin on the forums", fatal=True)
             return False
 
         if count == 1 and player_id != result[0][0]:
             self._logger.warning("UID hit: %d: %s", player_id, uid_hash)
             self.send_warning("Your computer is already associated with another FAF account.<br><br>In order to "
                               "log in with a new account, you have to link it to Steam: <a href='" +
                               config.APP_URL + "/faf/steam.php'>" +
-                              config.APP_URL + "/faf/steam.php</a>", fatal=True)
+                              config.APP_URL + "/faf/steam.php</a>.<br>If you need an exception, please contact an "
+                                               "admin on the forums", fatal=True)
             return False
 
         if count == 0: