diff --git a/src/components/UpdatePasswordModal.vue b/src/components/UpdatePasswordModal.vue
index 765194e..6e9a658 100644
--- a/src/components/UpdatePasswordModal.vue
+++ b/src/components/UpdatePasswordModal.vue
@@ -102,6 +102,8 @@ const {
               v-model="newPassword"
               name="new-password"
               type="password"
+              minlength="6"
+              maxlength="16"
               autocomplete="new-password"
               passwordrules="minlength: 6; maxlength: 16; max-consecutive: 2; allowed: [-!-~];"
               pattern="[-!-~]{6,16}"
@@ -115,6 +117,8 @@ const {
               v-model="newPasswordConfirm"
               name="new-password-confirm"
               type="password"
+              minlength="6"
+              maxlength="16"
               autocomplete="new-password"
               passwordrules="minlength: 6; maxlength: 16; max-consecutive: 2; allowed: [-!-~];"
               pattern="[-!-~]{6,16}"
diff --git a/src/pages/account/register.vue b/src/pages/account/register.vue
index c8c292d..f1b8695 100644
--- a/src/pages/account/register.vue
+++ b/src/pages/account/register.vue
@@ -116,6 +116,8 @@ customSeoMeta({ subsection: 'account', title: 'Register' });
             v-model="registerForm.password"
             name="password"
             type="password"
+            minlength="6"
+            maxlength="16"
             autocomplete="new-password"
             required
             passwordrules="minlength: 6; maxlength: 16; max-consecutive: 2; allowed: [-!-~];"
@@ -129,8 +131,12 @@ customSeoMeta({ subsection: 'account', title: 'Register' });
             v-model="registerForm.password_confirm"
             name="password_confirm"
             type="password"
+            minlength="6"
+            maxlength="16"
             autocomplete="new-password"
             required
+            passwordrules="minlength: 6; maxlength: 16; max-consecutive: 2; allowed: [-!-~];"
+            pattern="[-!-~]{6,16}"
           >
         </div>
         <Captcha
diff --git a/src/pages/account/reset-password.vue b/src/pages/account/reset-password.vue
index a5fd82a..63f59be 100644
--- a/src/pages/account/reset-password.vue
+++ b/src/pages/account/reset-password.vue
@@ -49,8 +49,12 @@ customSeoMeta({ subsection: 'account', title: 'Reset Password' });
             id="password"
             v-model="form.password"
             type="password"
+            minlength="6"
+            maxlength="16"
             required
             name="password"
+            passwordrules="minlength: 6; maxlength: 16; max-consecutive: 2; allowed: [-!-~];"
+            pattern="[-!-~]{6,16}"
             autocomplete="new-password"
           >
         </div>
@@ -61,7 +65,11 @@ customSeoMeta({ subsection: 'account', title: 'Reset Password' });
             v-model="form.passwordConfirm"
             name="password_confirm"
             type="password"
+            minlength="6"
+            maxlength="16"
             autocomplete="new-password"
+            passwordrules="minlength: 6; maxlength: 16; max-consecutive: 2; allowed: [-!-~];"
+            pattern="[-!-~]{6,16}"
             required
           >
         </div>