diff --git a/apps/dsp-app/src/app/user/user-form/password-form/password-form.component.html b/apps/dsp-app/src/app/user/user-form/password-form/password-form.component.html
index ffaca2ae9f..087cc1fcb3 100644
--- a/apps/dsp-app/src/app/user/user-form/password-form/password-form.component.html
+++ b/apps/dsp-app/src/app/user/user-form/password-form/password-form.component.html
@@ -35,9 +35,9 @@
{{ showRequesterPassword ? 'visibility_off' : 'visibility' }}
-
- {{ formErrors.requesterPassword }}
-
+
+ Incorrect password.
+
@@ -100,9 +100,9 @@
{{ showRequesterPassword ? 'visibility_off' : 'visibility' }}
-
- {{ formErrors.requesterPassword }}
-
+
+ Incorrect password.
+
@@ -200,7 +200,6 @@
class="submit-progress"
>
- close
{{
!loading && error
? ('appLabels.form.action.retry' | translate)
diff --git a/apps/dsp-app/src/app/user/user-form/password-form/password-form.component.ts b/apps/dsp-app/src/app/user/user-form/password-form/password-form.component.ts
index 73159081bc..a528dcf564 100644
--- a/apps/dsp-app/src/app/user/user-form/password-form/password-form.component.ts
+++ b/apps/dsp-app/src/app/user/user-form/password-form/password-form.component.ts
@@ -272,8 +272,10 @@ export class PasswordFormComponent implements OnInit {
this.buildForm();
this.loading = false;
},
- (error: ApiResponseError) => {
- this._errorHandler.showMessage(error);
+ () => {
+ this.confirmForm.controls.requesterPassword.setErrors({
+ incorrectPassword: true,
+ });
this.loading = false;
this.error = true;
}
@@ -305,7 +307,14 @@ export class PasswordFormComponent implements OnInit {
this.loading = false;
},
(error: ApiResponseError) => {
- this._errorHandler.showMessage(error);
+ if (error.status === 403) {
+ // incorrect old password
+ this.form.controls.requesterPassword.setErrors({
+ incorrectPassword: true,
+ });
+ } else {
+ this._errorHandler.showMessage(error);
+ }
this.loading = false;
this.error = true;
}