diff --git a/utils.py b/utils.py
index 9c7c8c681..abf25d28f 100644
--- a/utils.py
+++ b/utils.py
@@ -1598,7 +1598,7 @@ def getNicknameValidationPattern() -> str:
             pattern += '(?!.*\\b' + word + '\\b)'
         else:
             pattern = '^(?!.*\\b' + word + '\\b)'
-    return pattern + '.*$'
+    return pattern + '.*${1,30}'
 
 
 def _isReservedName(nickname: str) -> bool:
diff --git a/webapp_login.py b/webapp_login.py
index f5c24322e..c8d6e50a0 100644
--- a/webapp_login.py
+++ b/webapp_login.py
@@ -177,7 +177,7 @@ def htmlLogin(cssCache: {}, translate: {},
         translate['Password'] + '</b></label>\n' + \
         '    <input type="password" ' + autocompleteStr + \
         ' placeholder="' + translate['Enter Password'] + '" ' + \
-        'pattern="{8,}" name="password" required>\n' + \
+        'pattern="{8,256}" name="password" required>\n' + \
         loginButtonStr + registerButtonStr + '\n' + \
         '  </div>\n' + \
         '</form>\n' + \