diff --git a/networkmanager.cpp b/networkmanager.cpp
index 8c0eaa7..e58c85e 100644
--- a/networkmanager.cpp
+++ b/networkmanager.cpp
@@ -19,6 +19,11 @@ NetworkManager::NetworkManager(AOApplication *parent) : QObject(parent)
   QObject::connect(ms_socket, SIGNAL(readyRead()), this, SLOT(handle_ms_packet()));
   QObject::connect(server_socket, SIGNAL(readyRead()), this, SLOT(handle_server_packet()));
   QObject::connect(server_socket, SIGNAL(disconnected()), ao_app, SLOT(server_disconnected()));
+
+  QString master_config = ao_app->read_config("master");
+  if (master_config != "") {
+    ms_nosrv_hostname = master_config;
+  }
 }
 
 NetworkManager::~NetworkManager()
diff --git a/networkmanager.h b/networkmanager.h
index 32aef73..6954d19 100644
--- a/networkmanager.h
+++ b/networkmanager.h
@@ -38,9 +38,9 @@ public:
 
   const QString ms_srv_hostname = "_aoms._tcp.aceattorneyonline.com";
 #ifdef LOCAL_MS
-  const QString ms_nosrv_hostname = "localhost";
+  QString ms_nosrv_hostname = "localhost";
 #else
-  const QString ms_nosrv_hostname = "master.aceattorneyonline.com";
+  QString ms_nosrv_hostname = "master.aceattorneyonline.com";
 #endif
 
   const int ms_port = 27016;