diff --git a/src/main/java/me/kavin/piped/utils/ResponseHelper.java b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
index 8548c4c..7bdf47c 100644
--- a/src/main/java/me/kavin/piped/utils/ResponseHelper.java
+++ b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
@@ -633,6 +633,12 @@ public class ResponseHelper {
         if (StringUtils.isBlank(user) || StringUtils.isBlank(pass))
             return mapper.writeValueAsBytes(new InvalidRequestResponse());
 
+        if (user.length() > 24)
+            return mapper.writeValueAsBytes(
+                    mapper.createObjectNode()
+                            .put("error", "The username must be less than 24 characters")
+            );
+
         user = user.toLowerCase();
 
         try (Session s = DatabaseSessionFactory.createSession()) {