1 files changed, 11 insertions, 1 deletions
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 77b545fd..2fbc02d4 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -274,7 +274,17 @@ void LoginHandler::chooseServer(unsigned int server)
         return;
 
     charServer.clear();
-    charServer.hostname = ipToString(mWorlds[server]->address);
+
+    if (mServer.persistentIp)
+    {
+        charServer.hostname = mServer.hostname;
+        charServer.persistentIp = mServer.persistentIp;
+    }
+    else
+    {
+        charServer.hostname = ipToString(mWorlds[server]->address);
+    }
+
     charServer.port = mWorlds[server]->port;
 
     Client::setState(STATE_UPDATE);