diff --git a/static/main.js b/static/main.js
index eed544b..84ded2f 100644
--- a/static/main.js
+++ b/static/main.js
@@ -96,7 +96,7 @@
 
 TOO_SHORT = 'Password too short, still %% characters needed';
 TOO_LONG = 'Password too long, please remove %% characters';
-INVALID_CHARS = 'Password contains invalid characters';
+INVALID_CHARS = 'Invalid characters: only a-z, A-Z, 0-9 and !@#$%()_+=:;",.?/- are allowed.';
 QUAL_NONE = 'Password is very weak'
 QUAL_LOW = 'Password is weak';
 QUAL_MEDIUM = 'Password is average'
@@ -154,8 +154,8 @@
         var nLength = pass.length;
         if (nLength < 8)
             throw TOO_SHORT.replace('%%', 8 - nLength);
-        if (nLength > 20)
-            throw TOO_LONG.replace('%%', nLength - 20);
+        if (nLength > 128)
+            throw TOO_LONG.replace('%%', nLength - 128);
 
         nScore = 4 * nLength;