diff --git a/src/ProxyServer.cc b/src/ProxyServer.cc
index e7143136..c989a31f 100644
--- a/src/ProxyServer.cc
+++ b/src/ProxyServer.cc
@@ -23,7 +23,9 @@
 #include <phosg/Strings.hh>
 #include <phosg/Time.hh>
 
+#include "IPStackSimulator.hh"
 #include "Loggers.hh"
+#include "NetworkAddresses.hh"
 #include "PSOProtocol.hh"
 #include "ProxyCommands.hh"
 #include "ReceiveCommands.hh"
@@ -739,22 +741,19 @@ void ProxyServer::LinkedSession::send_to_game_server(const char* error_message)
     S_Reconnect_19 reconnect_cmd = {{0, s->name_to_port_config.at(port_name)->port, 0}};
 
     // If the client is on a virtual connection, we can use any address
-    // here and they should be able to connect back to the game server. If
-    // the client is on a real connection, we'll use the sockname of the
-    // existing connection (like we do in the server 19 command handler).
+    // here and they should be able to connect back to the game server
     if (this->client_channel.is_virtual_connection) {
       struct sockaddr_in* dest_sin = reinterpret_cast<struct sockaddr_in*>(&this->next_destination);
       if (dest_sin->sin_family != AF_INET) {
         throw logic_error("ss not AF_INET");
       }
-      reconnect_cmd.address.store_raw(dest_sin->sin_addr.s_addr);
+      reconnect_cmd.address = IPStackSimulator::connect_address_for_remote_address(ntohl(dest_sin->sin_addr.s_addr));
     } else {
-      const struct sockaddr_in* sin = reinterpret_cast<const struct sockaddr_in*>(
-          &this->client_channel.local_addr);
+      const struct sockaddr_in* sin = reinterpret_cast<const struct sockaddr_in*>(&this->client_channel.remote_addr);
       if (sin->sin_family != AF_INET) {
         throw logic_error("existing connection is not ipv4");
       }
-      reconnect_cmd.address.store_raw(sin->sin_addr.s_addr);
+      reconnect_cmd.address = is_local_address(ntohl(sin->sin_addr.s_addr)) ? s->local_address : s->external_address;
     }
 
     this->client_channel.send(0x19, 0x00, &reconnect_cmd, sizeof(reconnect_cmd));
diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index e78f4c3c..cc9c5170 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -84,10 +84,12 @@ static shared_ptr<const Menu> proxy_options_menu_for_client(shared_ptr<const Cli
         "Red name", "Set the colors\nof your name and\nChallenge Mode\nrank to red");
     add_option(ProxyOptionsMenuItemID::BLANK_NAME, Client::Flag::PROXY_BLANK_NAME_ENABLED,
         "Blank name", "Suppress your\ncharacter name\nduring login");
-    add_option(ProxyOptionsMenuItemID::SUPPRESS_LOGIN, Client::Flag::PROXY_SUPPRESS_REMOTE_LOGIN,
-        "Skip login", "Use an alternate\nlogin sequence");
-    add_option(ProxyOptionsMenuItemID::SKIP_CARD, Client::Flag::PROXY_ZERO_REMOTE_GUILD_CARD,
-        "Skip card", "Use an alternate\nvalue for your initial\nGuild Card");
+    if (c->version() != GameVersion::XB) {
+      add_option(ProxyOptionsMenuItemID::SUPPRESS_LOGIN, Client::Flag::PROXY_SUPPRESS_REMOTE_LOGIN,
+          "Skip login", "Use an alternate\nlogin sequence");
+      add_option(ProxyOptionsMenuItemID::SKIP_CARD, Client::Flag::PROXY_ZERO_REMOTE_GUILD_CARD,
+          "Skip card", "Use an alternate\nvalue for your initial\nGuild Card");
+    }
   }
 
   return ret;