diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiLoginPrompt.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiLoginPrompt.java
index f098289b..f492293c 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiLoginPrompt.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiLoginPrompt.java
@@ -50,6 +50,7 @@ public class GuiLoginPrompt extends GuiScreen {
             username = new GuiTextField(GuiConstants.LOGIN_USERNAME_FIELD, fontRendererObj, this.width / 2 - 45, 30, 145, 20);
             username.setEnabled(true);
             username.setFocused(true);
+            username.setMaxStringLength(16);
 
             password = new PasswordTextField(GuiConstants.LOGIN_PASSWORD_FIELD, fontRendererObj, this.width / 2 - 45, 60, 145, 20);
             password.setEnabled(true);
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java
index d25cec4f..0381a1fd 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java
@@ -46,6 +46,8 @@ public class GuiRegister extends GuiScreen {
 
         if(!initialized) {
             usernameInput = new GuiTextField(GuiConstants.REGISTER_USERNAME_FIELD, fontRendererObj, this.width / 2 - 45, 30, 145, 20);
+            usernameInput.setMaxStringLength(16);
+            
             mailInput = new GuiTextField(GuiConstants.REGISTER_MAIL_FIELD, fontRendererObj, this.width / 2 - 45, 60, 145, 20);
             passwordInput = new PasswordTextField(GuiConstants.REGISTER_PASSWORD_FIELD, fontRendererObj, this.width / 2 - 45, 90, 145, 20);
             passwordConfirmation = new PasswordTextField(GuiConstants.REGISTER_PASSWORD_CONFIRM_FIELD, fontRendererObj, this.width / 2 - 45, 120, 145, 20);
diff --git a/src/main/resources/assets/replaymod/lang/en_US.lang b/src/main/resources/assets/replaymod/lang/en_US.lang
index ab87823c..0ad05f76 100644
--- a/src/main/resources/assets/replaymod/lang/en_US.lang
+++ b/src/main/resources/assets/replaymod/lang/en_US.lang
@@ -26,6 +26,7 @@ replaymod.api.nopermissions=You don't have permission to do this
 replaymod.api.authfailed=Authentication to the Minecraft Session Servers failed
 replaymod.api.mcuserexists=A ReplayMod account is already associated with this Minecraft account
 replaymod.api.filetoobig=The uploaded file is too big
+replaymod.api.usernametoolong=The username is too long
 
 #All of the chat messages
 replaymod.chat.recordingstarted=Recording started