diff --git a/data/ui/mp/join/username_d.png b/data/ui/mp/join/username_d.png
new file mode 100644
index 00000000..069edceb
Binary files /dev/null and b/data/ui/mp/join/username_d.png differ
diff --git a/data/ui/mp/join/username_h.png b/data/ui/mp/join/username_h.png
new file mode 100644
index 00000000..a8b0d02c
Binary files /dev/null and b/data/ui/mp/join/username_h.png differ
diff --git a/data/ui/mp/join/username_n.png b/data/ui/mp/join/username_n.png
new file mode 100644
index 00000000..c047011c
Binary files /dev/null and b/data/ui/mp/join/username_n.png differ
diff --git a/data/ui/mp/play/connection-high.png b/data/ui/mp/play/connection-high.png
new file mode 100644
index 00000000..10cf5cd3
Binary files /dev/null and b/data/ui/mp/play/connection-high.png differ
diff --git a/data/ui/mp/play/connection-low.png b/data/ui/mp/play/connection-low.png
new file mode 100644
index 00000000..bb1c33ff
Binary files /dev/null and b/data/ui/mp/play/connection-low.png differ
diff --git a/data/ui/mp/play/connection-matanny.png b/data/ui/mp/play/connection-matanny.png
new file mode 100644
index 00000000..0ca616f6
Binary files /dev/null and b/data/ui/mp/play/connection-matanny.png differ
diff --git a/data/ui/mp/play/connection-medium.png b/data/ui/mp/play/connection-medium.png
new file mode 100644
index 00000000..e768a847
Binary files /dev/null and b/data/ui/mp/play/connection-medium.png differ
diff --git a/data/ui/mp/play/connection-unknown.png b/data/ui/mp/play/connection-unknown.png
new file mode 100644
index 00000000..8bb700bf
Binary files /dev/null and b/data/ui/mp/play/connection-unknown.png differ
diff --git a/src/gui/EnterNameDlg.hx b/src/gui/EnterNameDlg.hx
index ae8ae8f7..49552bad 100644
--- a/src/gui/EnterNameDlg.hx
+++ b/src/gui/EnterNameDlg.hx
@@ -96,7 +96,10 @@ class EnterNameDlg extends GuiControl {
 		enterNameText.position = new Vector(37, 23);
 		enterNameText.extent = new Vector(345, 85);
 		// enterNameText.justify = Center;
-		enterNameText.text.text = '<font face="Arial14"><br/></font><p align="center"><font face="DomCasual48">Well Done!<br/></font><font face="DomCasual32">You have the${["", " second", " third", " fourth", " fifth"][place]} top time!</font></p>';
+		if (place != -1)
+			enterNameText.text.text = '<font face="Arial14"><br/></font><p align="center"><font face="DomCasual48">Well Done!<br/></font><font face="DomCasual32">You have the${["", " second", " third", " fourth", " fifth"][place]} top time!</font></p>';
+		else
+			enterNameText.text.text = '<p align="center"><font face="DomCasual32">Enter your desired display name</font></p>';
 		dlg.addChild(enterNameText);
 
 		dlg.addChild(enterNameEdit);
diff --git a/src/gui/JoinServerGui.hx b/src/gui/JoinServerGui.hx
index f174f3e5..eb06c04b 100644
--- a/src/gui/JoinServerGui.hx
+++ b/src/gui/JoinServerGui.hx
@@ -258,6 +258,14 @@ class JoinServerGui extends GuiImage {
 		}
 		window.addChild(joinBtn);
 
+		var usernameBtn = new GuiButton(loadButtonImages("data/ui/mp/join/username"));
+		usernameBtn.position = new Vector(216, 379);
+		usernameBtn.extent = new Vector(125, 45);
+		usernameBtn.pressedAction = (e) -> {
+			MarbleGame.canvas.pushDialog(new EnterNameDlg(-1, (n) -> {}));
+		}
+		window.addChild(usernameBtn);
+
 		passwordJoin.pressedAction = (e) -> {
 			joinFunc(passwordInput.text.text);
 		}
@@ -329,5 +337,9 @@ class JoinServerGui extends GuiImage {
 		window.addChild(listTitle);
 
 		this.addChild(window);
+
+		if (StringTools.trim(Settings.highscoreName).length == 0 || Settings.highscoreName == "Player") {
+			MarbleGame.canvas.pushDialog(new EnterNameDlg(-1, (n) -> {})); // Pls enter name
+		}
 	}
 }