diff --git a/core/client/views/settings.js b/core/client/views/settings.js
index e90c843f31..77f68c25f4 100644
--- a/core/client/views/settings.js
+++ b/core/client/views/settings.js
@@ -214,8 +214,8 @@
                 return;
             }
 
-            if (newPassword.length < 8) {
-                this.saveError('The password is not long enough. Have at least 8 characters');
+            if (newPassword.length < 7) {
+                this.saveError('The password is not long enough. Have at least 7 characters');
                 return;
             }
 
diff --git a/index.js b/index.js
index bbac7c720d..b952ca6b88 100644
--- a/index.js
+++ b/index.js
@@ -92,8 +92,8 @@ function signupValidate(req, res, next) {
         res.json(401, {error: "Please check your email address. It does not seem to be valid."});
         return;
     }
-    if (!v.check(password).len(8)) {
-        res.json(401, {error: 'Your password is not long enough. It must be at least 8 chars long.'});
+    if (!v.check(password).len(7)) {
+        res.json(401, {error: 'Your password is not long enough. It must be at least 7 chars long.'});
         return;
     }
     next();