diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index 0d470b07..262c6afd 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -951,6 +951,9 @@ void MenuStateConnectedGame::simpleTask(BaseThread *callingThread,void *userdata
 
 	if(config.getString("Masterserver","") != "") {
 		string baseURL = config.getString("Masterserver");
+		if(baseURL != "") {
+			endPathWithSlash(baseURL,false);
+		}
 		string phpVersionParam = config.getString("phpVersionParam","?version=0.1");
 		string gameVersion = "&glestVersion=" + SystemFlags::escapeURL(glestVersionString);
 		string playerUUID = "&uuid=" + SystemFlags::escapeURL(config.getString("PlayerId",""));
diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index f690fa85..af632b74 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -3160,7 +3160,11 @@ void MenuStateCustomGame::simpleTaskForMasterServer(BaseThread *callingThread) {
         if(republish == true) {
         	if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
 
-            string request = Config::getInstance().getString("Masterserver") + "addServerInfo.php?";
+            string request = Config::getInstance().getString("Masterserver");
+    		if(request != "") {
+    			endPathWithSlash(request,false);
+    		}
+    		request += "addServerInfo.php?";
 
             //CURL *handle = SystemFlags::initHTTP();
             CURL *handle = callingThread->getGenericData<CURL>();
diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp
index 19275493..c6e1da1d 100644
--- a/source/glest_game/menu/menu_state_masterserver.cpp
+++ b/source/glest_game/menu/menu_state_masterserver.cpp
@@ -1005,8 +1005,13 @@ void MenuStateMasterserver::simpleTask(BaseThread *callingThread,void *userdata)
 					CURL *handle = SystemFlags::initHTTP();
 
 					string playerUUID = "?uuid=" + SystemFlags::escapeURL(Config::getInstance().getString("PlayerId",""));
-                    std::string localServerInfoString = SystemFlags::getHTTP(
-                    		Config::getInstance().getString("Masterserver") + "showServersForGlest.php" + playerUUID,handle);
+
+					string baseURL = Config::getInstance().getString("Masterserver");
+		    		if(baseURL != "") {
+		    			endPathWithSlash(baseURL,false);
+		    		}
+
+					std::string localServerInfoString = SystemFlags::getHTTP(baseURL + "showServersForGlest.php" + playerUUID,handle);
 					SystemFlags::cleanupHTTP(&handle);
                     if(callingThread->getQuitStatus() == true) {
                         return;
diff --git a/source/glest_game/menu/menu_state_mods.cpp b/source/glest_game/menu/menu_state_mods.cpp
index 3f74eb7e..040c0c5a 100644
--- a/source/glest_game/menu/menu_state_mods.cpp
+++ b/source/glest_game/menu/menu_state_mods.cpp
@@ -427,6 +427,10 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
 
 	if(config.getString("Masterserver","") != "") {
 		string baseURL = config.getString("Masterserver");
+		if(baseURL != "") {
+			endPathWithSlash(baseURL,false);
+		}
+
 		string phpVersionParam = config.getString("phpVersionParam","?version=0.1");
 		string playerUUID = "&uuid=" + SystemFlags::escapeURL(Config::getInstance().getString("PlayerId",""));
 		string gameVersion = "&glestVersion=" + SystemFlags::escapeURL(glestVersionString);
diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp
index 30171ea0..6f8988a8 100644
--- a/source/glest_game/network/server_interface.cpp
+++ b/source/glest_game/network/server_interface.cpp
@@ -2988,7 +2988,11 @@ void ServerInterface::simpleTask(BaseThread *callingThread,void *userdata) {
 		if(needToRepublishToMasterserver == true) {
 			try {
 				if(Config::getInstance().getString("Masterserver","") != "") {
-					string request = Config::getInstance().getString("Masterserver") + "addServerInfo.php?";
+					string request = Config::getInstance().getString("Masterserver");
+					if(request != "") {
+						endPathWithSlash(request,false);
+					}
+					request += "addServerInfo.php?";
 
 					std::map<string,string> newPublishToServerInfo = publishToMasterserver();
 
@@ -3012,7 +3016,12 @@ void ServerInterface::simpleTask(BaseThread *callingThread,void *userdata) {
 					std::string serverInfo = SystemFlags::getHTTP(request,handle);
 					//printf("Result:\n%s\n",serverInfo .c_str());
 
-					string requestStats = Config::getInstance().getString("Masterserver") + "addGameStats.php?";
+					string requestStats = Config::getInstance().getString("Masterserver");
+					if(requestStats != "") {
+						endPathWithSlash(requestStats,false);
+					}
+					requestStats += "addGameStats.php?";
+
 					std::map<string,string> newPublishToServerInfoStats = publishToMasterserverStats();
 					if(newPublishToServerInfoStats.empty() == false) {
 						for(std::map<string,string>::const_iterator iterMap = newPublishToServerInfoStats.begin();