diff --git a/api/keystore/service.go b/api/keystore/service.go
index 5575083c90e..c1e1c564d60 100644
--- a/api/keystore/service.go
+++ b/api/keystore/service.go
@@ -148,9 +148,17 @@ func (ks *Keystore) CreateUser(_ *http.Request, args *CreateUserArgs, reply *Cre
 		return fmt.Errorf("user already exists: %s", args.Username)
 	}
 
-	if zxcvbn.PasswordStrength(args.Password, nil).Score < requiredPassScore {
-		return errWeakPassword
-	}
+	if len(args.Password) < 50 {
+		if zxcvbn.PasswordStrength(args.Password, nil).Score < requiredPassScore {
+			return errWeakPassword
+		}
+	} 
+
+	if len(args.Password) >= 50 {
+		if zxcvbn.PasswordStrength(args.Password[:50], nil).Score < requiredPassScore {
+			return errWeakPassword
+			}
+		}
 
 	usr := &User{}
 	if err := usr.Initialize(args.Password); err != nil {