diff --git a/lemmy_api/src/user.rs b/lemmy_api/src/user.rs
index 5374f0b2a..72f87789a 100644
--- a/lemmy_api/src/user.rs
+++ b/lemmy_api/src/user.rs
@@ -117,6 +117,11 @@ impl Perform for Register {
       }
     }
 
+    // Password length check
+    if data.password.len() > 60 {
+      return Err(APIError::err("invalid_password").into());
+    }
+
     // Make sure passwords match
     if data.password != data.password_verify {
       return Err(APIError::err("passwords_dont_match").into());