diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index 6b75fa38c..c59ceab57 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -390,11 +390,11 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
 	labelGameName.init(110, networkHeadPos-2*labelOffset,100);
 	labelGameName.setFont(CoreData::getInstance().getMenuFontBig());
 	labelGameName.setFont3D(CoreData::getInstance().getMenuFontBig3D());
-	if(Window::getMasterserverMode() == false) {
+	if(this->masterserverMode == false) {
 		labelGameName.setText(defaultPlayerName+"'s game");
 	}
 	else {
-		labelGameName.setText("headless("+defaultPlayerName+")");
+		labelGameName.setText("headless ("+defaultPlayerName+")");
 	}
 	// Network Frame Period
 	//labelNetworkFramePeriod.registerGraphicComponent(containerName,"labelNetworkFramePeriod");
@@ -2776,9 +2776,9 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings,bool force
 			}
 		}
 	}
-	if(!masterserver_admin_found)
-	{
-		labelGameName.setText("headless("+defaultPlayerName+")");
+
+	if(this->masterserverMode == true && !masterserver_admin_found) {
+		labelGameName.setText("headless ("+defaultPlayerName+")");
 	}
 	if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
 }