diff --git a/src/server/components/auth.js b/src/server/components/auth.js
index 7a36db04..0dc556ff 100644
--- a/src/server/components/auth.js
+++ b/src/server/components/auth.js
@@ -268,6 +268,10 @@ module.exports = {
 		if (credentials.username === '' || credentials.password === '') {
 			msg.callback(messages.login.allFields);
 
+			return;
+		} else if (credentials.username.length > 32) {
+			msg.callback(messages.login.maxUsernameLength);
+
 			return;
 		}