diff --git a/ui-ngx/src/app/modules/home/pages/security/security.component.html b/ui-ngx/src/app/modules/home/pages/security/security.component.html
index c5d3d25f4f..4fca803187 100644
--- a/ui-ngx/src/app/modules/home/pages/security/security.component.html
+++ b/ui-ngx/src/app/modules/home/pages/security/security.component.html
@@ -54,7 +54,7 @@
               <mat-label translate>profile.current-password</mat-label>
               <input matInput type="password" name="current-password" formControlName="currentPassword" autocomplete="current-password"/>
               <tb-toggle-password [class.!hidden]="!changePassword.get('currentPassword').dirty && !changePassword.get('currentPassword').touched" matSuffix></tb-toggle-password>
-              <mat-error *ngIf="changePassword.get('currentPassword').hasError('passwordsNotMatch')">
+              <mat-error *ngIf="changePassword.get('currentPassword').hasError('differencePassword')">
                 {{ 'security.password-requirement.incorrect-password-try-again' | translate }}
               </mat-error>
             </mat-form-field>
diff --git a/ui-ngx/src/app/modules/home/pages/security/security.component.ts b/ui-ngx/src/app/modules/home/pages/security/security.component.ts
index 860dd45a5b..25eb42e673 100644
--- a/ui-ngx/src/app/modules/home/pages/security/security.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/security/security.component.ts
@@ -333,22 +333,24 @@ export class SecurityComponent extends PageComponent implements OnInit, OnDestro
   onChangePassword(form: FormGroupDirective): void {
     if (this.changePassword.valid) {
       this.authService.changePassword(this.changePassword.get('currentPassword').value,
-        this.changePassword.get('newPassword').value, {ignoreErrors: true}).subscribe(() => {
-          this.discardChanges(form);
-        },
-        (error) => {
-          if (error.status === 400 && error.error.message === 'Current password doesn\'t match!') {
-            this.changePassword.get('currentPassword').setErrors({differencePassword: true});
-          } else if (error.status === 400 && error.error.message.startsWith('Password must')) {
-            this.loadPasswordPolicy();
-          } else if (error.status === 400 && error.error.message.startsWith('Password was already used')) {
-            this.changePassword.get('newPassword').setErrors({alreadyUsed: error.error.message});
-          } else {
-            this.store.dispatch(new ActionNotificationShow({
-              message: error.error.message,
-              type: 'error',
-              target: 'changePassword'
-            }));
+        this.changePassword.get('newPassword').value, {ignoreErrors: true}).subscribe({
+          next: () => {
+            this.discardChanges(form);
+          },
+          error: (error) => {
+            if (error.status === 400 && error.error.message === 'Current password doesn\'t match!') {
+              this.changePassword.get('currentPassword').setErrors({ differencePassword: true });
+            } else if (error.status === 400 && error.error.message.startsWith('Password must')) {
+              this.loadPasswordPolicy();
+            } else if (error.status === 400 && error.error.message.startsWith('Password was already used')) {
+              this.changePassword.get('newPassword').setErrors({ alreadyUsed: error.error.message });
+            } else {
+              this.store.dispatch(new ActionNotificationShow({
+                message: error.error.message,
+                type: 'error',
+                target: 'changePassword'
+              }));
+            }
           }
         });
     } else {