diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json
index 37611e8293..2bc4fec54a 100644
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@@ -5,7 +5,7 @@
     "test": "ng test",
     "symlink": "symlink",
     "abpng": "abpng",
-    "commit": "git-cz && node scripts/push.js",
+    "commit": "git-cz",
     "lint": "ng lint --fix",
     "scripts:build": "cd scripts && npm install && npm run build"
   },
diff --git a/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.ts b/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.ts
index 850e4e37a1..a1a0a51216 100644
--- a/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.ts
+++ b/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.ts
@@ -7,7 +7,7 @@ import { Store } from '@ngxs/store';
 import snq from 'snq';
 import { finalize } from 'rxjs/operators';
 
-const { minLength, required } = Validators;
+const { minLength, required, maxLength } = Validators;
 
 const PASSWORD_FIELDS = ['newPassword', 'repeatNewPassword'];
 
@@ -61,12 +61,12 @@ export class ChangePasswordComponent implements OnInit {
         newPassword: [
           '',
           {
-            validators: [required, validatePassword(passwordRulesArr), minLength(requiredLength)],
+            validators: [required, validatePassword(passwordRulesArr), minLength(requiredLength), maxLength(32)],
           },
         ],
         repeatNewPassword: [
           '',
-          { validators: [required, validatePassword(passwordRulesArr), minLength(requiredLength)] },
+          { validators: [required, validatePassword(passwordRulesArr), minLength(requiredLength), maxLength(32)] },
         ],
       },
       {