diff --git a/src/gui/EndGameGui.hx b/src/gui/EndGameGui.hx
index fc7004ae..c280aa35 100644
--- a/src/gui/EndGameGui.hx
+++ b/src/gui/EndGameGui.hx
@@ -206,7 +206,7 @@ class EndGameGui extends GuiImage {
 			});
 		}
 		if (bestScore.time == score) {
-			if (Settings.highscoreName == "" || Settings.highscoreName == "Player Name") {
+			if (Settings.highscoreName == "" || Settings.highscoreName == "Player" || Settings.highscoreName == "Player Name") {
 				haxe.Timer.delay(() -> {
 					MarbleGame.canvas.pushDialog(new EnterNamePopupDlg(() -> {
 						submitScore();
diff --git a/src/gui/MainMenuGui.hx b/src/gui/MainMenuGui.hx
index 1eb8c2a4..67c35550 100644
--- a/src/gui/MainMenuGui.hx
+++ b/src/gui/MainMenuGui.hx
@@ -76,7 +76,9 @@ class MainMenuGui extends GuiImage {
 				cast(this.parent, Canvas).pushDialog(new MessageBoxOkDlg("Custom levels not loaded yet, please wait."));
 				MPCustoms.loadMissionList();
 			} else {
-				if (StringTools.trim(Settings.highscoreName) == "" || Settings.highscoreName == "Player") {
+				if (StringTools.trim(Settings.highscoreName) == ""
+					|| Settings.highscoreName == "Player"
+					|| Settings.highscoreName == "Player Name") {
 					MarbleGame.canvas.setContent(new EnterNameDlg());
 				} else
 					cast(this.parent, Canvas).setContent(new MultiplayerGui());