diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 146177295..760cd6842 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1380,7 +1380,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 				}
 
 				if(strpos($packet->username, "\x00") !== false or preg_match('#^[a-zA-Z0-9_]{3,16}$#', $packet->username) == 0 or $this->username === "" or $this->iusername === "rcon" or $this->iusername === "console" or strlen($packet->username) > 16 or strlen($packet->username) < 3){
-					$this->close("", "Bad username");
+					$this->close("", "disconnectionScreen.invalidName");
 
 					return;
 				}
diff --git a/src/pocketmine/lang/locale b/src/pocketmine/lang/locale
index ed9a06a6d..2c4b52367 160000
--- a/src/pocketmine/lang/locale
+++ b/src/pocketmine/lang/locale
@@ -1 +1 @@
-Subproject commit ed9a06a6d2bb491782ec2c8b4310aa683cfdf8af
+Subproject commit 2c4b523670bfa6d53b28774325f94c9c0d51749c