diff --git a/apps/web/src/app/organizations/manage/reset-password.component.ts b/apps/web/src/app/organizations/manage/reset-password.component.ts
index 93fb6ff75f1a..d37148a25ebd 100644
--- a/apps/web/src/app/organizations/manage/reset-password.component.ts
+++ b/apps/web/src/app/organizations/manage/reset-password.component.ts
@@ -81,7 +81,7 @@ export class ResetPasswordComponent implements OnInit {
       this.platformUtilsService.showToast(
         "error",
         this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPassRequired")
+        this.i18nService.t("masterPasswordRequired")
       );
       return false;
     }
@@ -90,7 +90,7 @@ export class ResetPasswordComponent implements OnInit {
       this.platformUtilsService.showToast(
         "error",
         this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPassLength")
+        this.i18nService.t("masterPasswordMinlength")
       );
       return false;
     }
diff --git a/apps/web/src/app/settings/change-password.component.ts b/apps/web/src/app/settings/change-password.component.ts
index 7636c6970b51..8044c3cf3ad2 100644
--- a/apps/web/src/app/settings/change-password.component.ts
+++ b/apps/web/src/app/settings/change-password.component.ts
@@ -139,7 +139,7 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
       this.platformUtilsService.showToast(
         "error",
         this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPassRequired")
+        this.i18nService.t("masterPasswordRequired")
       );
       return false;
     }
diff --git a/apps/web/src/app/settings/update-key.component.ts b/apps/web/src/app/settings/update-key.component.ts
index bf0afc150d6a..52a22d13e95b 100644
--- a/apps/web/src/app/settings/update-key.component.ts
+++ b/apps/web/src/app/settings/update-key.component.ts
@@ -45,7 +45,7 @@ export class UpdateKeyComponent {
       this.platformUtilsService.showToast(
         "error",
         this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPassRequired")
+        this.i18nService.t("masterPasswordRequired")
       );
       return;
     }
diff --git a/libs/angular/src/components/change-password.component.ts b/libs/angular/src/components/change-password.component.ts
index b4e2febbf42b..3730ac75f63d 100644
--- a/libs/angular/src/components/change-password.component.ts
+++ b/libs/angular/src/components/change-password.component.ts
@@ -97,7 +97,7 @@ export class ChangePasswordComponent implements OnInit {
       this.platformUtilsService.showToast(
         "error",
         this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPassRequired")
+        this.i18nService.t("masterPasswordRequired")
       );
       return false;
     }
@@ -105,7 +105,7 @@ export class ChangePasswordComponent implements OnInit {
       this.platformUtilsService.showToast(
         "error",
         this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPassLength")
+        this.i18nService.t("masterPasswordMinlength")
       );
       return false;
     }
diff --git a/libs/angular/src/components/lock.component.ts b/libs/angular/src/components/lock.component.ts
index d00127ae965d..0932fab7128b 100644
--- a/libs/angular/src/components/lock.component.ts
+++ b/libs/angular/src/components/lock.component.ts
@@ -180,7 +180,7 @@ export class LockComponent implements OnInit, OnDestroy {
       this.platformUtilsService.showToast(
         "error",
         this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPassRequired")
+        this.i18nService.t("masterPasswordRequired")
       );
       return;
     }
diff --git a/libs/angular/src/components/login.component.ts b/libs/angular/src/components/login.component.ts
index 259fce5a6529..1c7a8c2332d0 100644
--- a/libs/angular/src/components/login.component.ts
+++ b/libs/angular/src/components/login.component.ts
@@ -91,7 +91,7 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
       this.platformUtilsService.showToast(
         "error",
         this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPassRequired")
+        this.i18nService.t("masterPasswordRequired")
       );
       return;
     }
diff --git a/libs/angular/src/components/update-password.component.ts b/libs/angular/src/components/update-password.component.ts
index c2f076e10792..3fe9a6a76604 100644
--- a/libs/angular/src/components/update-password.component.ts
+++ b/libs/angular/src/components/update-password.component.ts
@@ -69,7 +69,7 @@ export class UpdatePasswordComponent extends BaseChangePasswordComponent {
       this.platformUtilsService.showToast(
         "error",
         this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPassRequired")
+        this.i18nService.t("masterPasswordRequired")
       );
       return false;
     }
diff --git a/libs/common/src/services/userVerification/userVerification.service.ts b/libs/common/src/services/userVerification/userVerification.service.ts
index f58515d9a40e..fe2d5f4716d3 100644
--- a/libs/common/src/services/userVerification/userVerification.service.ts
+++ b/libs/common/src/services/userVerification/userVerification.service.ts
@@ -81,7 +81,7 @@ export class UserVerificationService implements UserVerificationServiceAbstracti
       if (verification.type === VerificationType.OTP) {
         throw new Error(this.i18nService.t("verificationCodeRequired"));
       } else {
-        throw new Error(this.i18nService.t("masterPassRequired"));
+        throw new Error(this.i18nService.t("masterPasswordRequired"));
       }
     }
   }