diff --git a/include/config_manager.h b/include/config_manager.h
index 7c5deb0..4c1baa2 100644
--- a/include/config_manager.h
+++ b/include/config_manager.h
@@ -36,7 +36,7 @@ class ConfigManager {
         QString ms_ip;
         int port;
         int ws_port;
-        int local_port;
+        int ms_port;
         QString name;
         QString description;
         bool advertise_server;
diff --git a/src/config_manager.cpp b/src/config_manager.cpp
index 7f0f93a..7364d9d 100644
--- a/src/config_manager.cpp
+++ b/src/config_manager.cpp
@@ -139,8 +139,8 @@ bool ConfigManager::loadServerSettings(server_settings* settings)
         config.value("port", "27016").toInt(&port_conversion_success);
     settings->ws_port =
         config.value("webao_port", "27017").toInt(&ws_port_conversion_success);
-    settings->local_port =
-        config.value("port", "27016").toInt(&local_port_conversion_success);
+    settings->ms_port =
+        config.value("ms_port", "27016").toInt(&local_port_conversion_success);
     settings->name = config.value("server_name", "My First Server").toString();
     settings->description =
         config.value("server_description", "This is my flashy new server")
diff --git a/src/main.cpp b/src/main.cpp
index 630965b..7e3a090 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -55,8 +55,8 @@ int main(int argc, char* argv[])
         else {
             if (settings.advertise_server) {
                 advertiser =
-                    new Advertiser(settings.ms_ip, settings.port,
-                                   settings.ws_port, settings.local_port,
+                    new Advertiser(settings.ms_ip, settings.ms_port,
+                                   settings.ws_port, settings.port,
                                    settings.name, settings.description);
                 advertiser->contactMasterServer();
             }