diff --git a/cockatrice/src/dlg_connect.cpp b/cockatrice/src/dlg_connect.cpp
index 4d0c8be4..7de8c3eb 100644
--- a/cockatrice/src/dlg_connect.cpp
+++ b/cockatrice/src/dlg_connect.cpp
@@ -14,8 +14,6 @@
 #include <QPushButton>
 #include <QRadioButton>
 
-#define PUBLIC_SERVERS_URL "https://github.com/Cockatrice/Cockatrice/wiki/Public-Servers"
-
 DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
 {
     previousHostButton = new QRadioButton(tr("Known Hosts"), this);
diff --git a/cockatrice/src/handle_public_servers.cpp b/cockatrice/src/handle_public_servers.cpp
index 7bbbbeb2..c1308802 100644
--- a/cockatrice/src/handle_public_servers.cpp
+++ b/cockatrice/src/handle_public_servers.cpp
@@ -71,6 +71,10 @@ void HandlePublicServers::updateServerINISettings(QMap<QString, QVariant> jsonMa
         QString serverPort = serverMap["port"].toString();
         QString serverSite = serverMap["site"].toString();
 
+        if (serverMap.contains("websocketPort")) {
+            serverPort = serverMap["websocketPort"].toString();
+        }
+
         bool serverFound = false;
         for (const auto &iter : savedHostList) {
             // If the URL/IP matches
diff --git a/cockatrice/src/remoteclient.cpp b/cockatrice/src/remoteclient.cpp
index ec8d7d91..3451e575 100644
--- a/cockatrice/src/remoteclient.cpp
+++ b/cockatrice/src/remoteclient.cpp
@@ -359,7 +359,7 @@ void RemoteClient::connectToHost(const QString &hostname, unsigned int port)
 {
     usingWebSocket = port == 443 || port == 80 || port == 4748 || port == 8080;
     if (usingWebSocket) {
-        QUrl url(QString("%1://%2:%3").arg(port == 443 ? "wss" : "ws").arg(hostname).arg(port));
+        QUrl url(QString("%1://%2:%3/servatrice").arg(port == 443 ? "wss" : "ws").arg(hostname).arg(port));
         websocket->open(url);
     } else {
         socket->connectToHost(hostname, static_cast<quint16>(port));