diff --git a/src/components/Form/FormFields/PasswordRule.vue b/src/components/Form/FormFields/PasswordRule.vue
index 8f7424833..3c1cbba87 100644
--- a/src/components/Form/FormFields/PasswordRule.vue
+++ b/src/components/Form/FormFields/PasswordRule.vue
@@ -48,7 +48,7 @@ export default {
             type: 'input-number',
             el: {
               min: 8,
-              max: 30
+              max: 36
             }
           },
           {
diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue
index b722d700b..52fa9b16c 100644
--- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue
+++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue
@@ -19,7 +19,7 @@ export default {
       initial: {
         is_periodic: false,
         password_rules: {
-          length: 16
+          length: 36
         },
         interval: 24,
         accounts: [],
diff --git a/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue b/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue
index 39c095290..87688d4e1 100644
--- a/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue
+++ b/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue
@@ -21,7 +21,7 @@ export default {
       initial: {
         is_periodic: false,
         password_rules: {
-          length: 30
+          length: 36
         },
         interval: 24,
         secret_type: 'password',