diff --git a/www/common/login.js b/www/common/login.js
index ceda207c6..9a13b83c0 100644
--- a/www/common/login.js
+++ b/www/common/login.js
@@ -88,7 +88,9 @@ define([
         // validate inputs
         if (!Cred.isValidUsername(uname)) { return void cb('INVAL_USER'); }
         if (!Cred.isValidPassword(passwd)) { return void cb('INVAL_PASS'); }
-        if (!Cred.isLongEnoughPassword(passwd)) { return void cb('PASS_TOO_SHORT'); }
+        if (isRegister && !Cred.isLongEnoughPassword(passwd)) {
+            return void cb('PASS_TOO_SHORT'); }
+        }
 
         Cred.deriveFromPassphrase(uname, passwd, 128, function (bytes) {
             // results...