diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 4209d7ca2..ff288c5db 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -238,7 +238,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
 
         if ( getName().length() > 16 )
         {
-            disconnect( "Cannot have username longer than 16 characters" );
+            disconnect( bungee.getTranslation( "name_too_long" ) );
             return;
         }
 
diff --git a/proxy/src/main/resources/messages.properties b/proxy/src/main/resources/messages.properties
index ca7e615f3..64053986b 100644
--- a/proxy/src/main/resources/messages.properties
+++ b/proxy/src/main/resources/messages.properties
@@ -19,3 +19,4 @@ server_kick=[Kicked]
 server_list=\u00a76You may connect to the following servers at this time: 
 server_went_down=\u00a7cThe server you were previously on went down, you have been connected to the lobby
 total_players=Total players online: {0}
+name_too_long=Cannot have username longer than 16 characters