diff --git a/server/src/main/scala/net/psforever/server/Server.scala b/server/src/main/scala/net/psforever/server/Server.scala
index ee1ce7b36..2ec30a503 100644
--- a/server/src/main/scala/net/psforever/server/Server.scala
+++ b/server/src/main/scala/net/psforever/server/Server.scala
@@ -82,11 +82,6 @@ object Server {
         case Some(address) => InetAddress.getByName(address)         // address from first argument
         case None          => InetAddress.getByName(Config.app.bind) // address from config
       }
-    val publicAddress: InetAddress =
-      args.bind match {
-        case Some(address) => InetAddress.getByName(address)           // address from first argument
-        case None          => InetAddress.getByName(Config.app.public) // address from config
-      }
 
     if (Config.app.kamon.enable) {
       logger.info("Starting Kamon")
@@ -142,7 +137,7 @@ object Server {
     system.spawn(
       SocketPane(Seq(
         SocketSetup("login", SocketSetupInfo(bindAddress, Seq(Config.app.login.port), loginPlan)),
-        SocketSetup("world", SocketSetupInfo(publicAddress, Config.app.world.port +: Config.app.world.ports, sessionPlan))
+        SocketSetup("world", SocketSetupInfo(bindAddress, Config.app.world.port +: Config.app.world.ports, sessionPlan))
       )),
       name = SocketPane.SocketPaneKey.id
     )
diff --git a/src/main/scala/net/psforever/actors/net/LoginActor.scala b/src/main/scala/net/psforever/actors/net/LoginActor.scala
index 95df6fc2a..0205261b0 100644
--- a/src/main/scala/net/psforever/actors/net/LoginActor.scala
+++ b/src/main/scala/net/psforever/actors/net/LoginActor.scala
@@ -27,6 +27,8 @@ import scala.concurrent.duration._
 import scala.util.matching.Regex
 import scala.util.{Failure, Success}
 
+
+
 object LoginActor {
   sealed trait Command
 
@@ -56,7 +58,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
   var port: Int                 = 0
 
   val serverName: String = Config.app.world.serverName
-  val publicAddress = new InetSocketAddress(InetAddress.getByName(Config.app.public), Config.app.world.port)
+  val gameTestServerAddress = new InetSocketAddress(InetAddress.getByName(Config.app.public), Config.app.world.port)
 
   private val bcryptRounds = 12
 
@@ -87,7 +89,8 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
     case packet: PlanetSideGamePacket =>
       handleGamePkt(packet)
 
-    case SocketPane.NextPort(_, address, portNum) =>
+    case SocketPane.NextPort(_, _, portNum) =>
+      val address = gameTestServerAddress.getAddress
       log.info(s"Connecting to ${address.getHostAddress.toLowerCase}: $portNum ...")
       val response = ConnectToWorldMessage(serverName, address.getHostAddress, portNum)
       middlewareActor ! MiddlewareActor.Send(response)
@@ -441,7 +444,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
             serverName,
             WorldStatus.Up,
             Config.app.world.serverType,
-            Vector(WorldConnectionInfo(publicAddress)), //todo ideally, ask for info from SocketPane
+            Vector(WorldConnectionInfo(gameTestServerAddress)), //todo ideally, ask for info from SocketPane
             PlanetSideEmpire.VS
           )
         )