diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index da381f256a..b1aa0d6fb9 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -70,8 +70,8 @@ text.continue = Continue
 text.nextmission = Next Mission
 text.maps.none = [LIGHT_GRAY]No maps found!
 text.about.button = About
-text.name = Player Name:
-text.noname = Pick a[accent] player name[] before connecting.
+text.name = Name:
+text.noname = Pick in a[accent] player name[] first.
 text.filename = File Name:
 text.unlocked = New Block Unlocked!
 text.unlocked.plural = New Blocks Unlocked!
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
index 077cd57de9..06aa5f165f 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
@@ -50,6 +50,11 @@ public class HostDialog extends FloatingDialog{
         content().add().width(65f);
 
         content().addButton("$text.host", () -> {
+            if(Settings.getString("name").trim().isEmpty()){
+                ui.showInfo("$text.noname");
+                return;
+            }
+
             ui.loadfrag.show("$text.hosting");
             Timers.runTask(5f, () -> {
                 try{