diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml
index a75dc2d9fb3..fdfa5f4e41c 100644
--- a/app/views/auth/passwords/edit.html.haml
+++ b/app/views/auth/passwords/edit.html.haml
@@ -16,7 +16,7 @@
                 wrapper: :with_label
     .fields-group
       = f.input :password_confirmation,
-                input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_new_password'), autocomplete: 'new-password' },
+                input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_new_password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last },
                 label: t('simple_form.labels.defaults.confirm_new_password'),
                 required: true,
                 wrapper: :with_label
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index 07d6c1af51d..b33a1a14a1c 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -39,7 +39,7 @@
       .fields-row__column.fields-group.fields-row__column-6
         = f.input :password_confirmation,
                   disabled: current_account.suspended?,
-                  input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_new_password'), autocomplete: 'new-password' },
+                  input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_new_password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last },
                   label: t('simple_form.labels.defaults.confirm_new_password'),
                   wrapper: :with_label
 
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index eef4b485f6a..b2ea79c648a 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -36,7 +36,7 @@
               wrapper: :with_label
     = f.input :password_confirmation,
               hint: false,
-              input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_password'), autocomplete: 'new-password', maxlength: User.password_length.last },
+              input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last },
               placeholder: t('simple_form.labels.defaults.confirm_password'),
               required: true
     = f.input :confirm_password,