diff --git a/apps/web/src/app/settings/change-password.component.html b/apps/web/src/app/settings/change-password.component.html
index 90df85042e6..3171d8e0ea8 100644
--- a/apps/web/src/app/settings/change-password.component.html
+++ b/apps/web/src/app/settings/change-password.component.html
@@ -64,6 +64,17 @@
       </div>
     </div>
   </div>
+  <div class="form-group">
+    <label for="masterPasswordHint">{{ "masterPassHintLabel" | i18n }}</label>
+    <input
+      id="masterPasswordHint"
+      class="form-control"
+      maxlength="50"
+      type="text"
+      name="MasterPasswordHint"
+      [(ngModel)]="masterPasswordHint"
+    />
+  </div>
   <div class="form-group">
     <div class="form-check">
       <input
diff --git a/apps/web/src/app/settings/change-password.component.ts b/apps/web/src/app/settings/change-password.component.ts
index d36a1eb1cb3..367cbe9498b 100644
--- a/apps/web/src/app/settings/change-password.component.ts
+++ b/apps/web/src/app/settings/change-password.component.ts
@@ -36,6 +36,7 @@ import { UpdateKeyRequest } from "@bitwarden/common/models/request/updateKeyRequ
 export class ChangePasswordComponent extends BaseChangePasswordComponent {
   rotateEncKey = false;
   currentMasterPassword: string;
+  masterPasswordHint: string;
 
   constructor(
     i18nService: I18nService,
@@ -69,6 +70,8 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
     if (await this.keyConnectorService.getUsesKeyConnector()) {
       this.router.navigate(["/settings/security/two-factor"]);
     }
+
+    this.masterPasswordHint = (await this.apiService.getProfile()).masterPasswordHint;
     await super.ngOnInit();
   }
 
@@ -156,6 +159,7 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
       this.currentMasterPassword,
       null
     );
+    request.masterPasswordHint = this.masterPasswordHint;
     request.newMasterPasswordHash = newMasterPasswordHash;
     request.key = newEncKey[1].encryptedString;
 
diff --git a/apps/web/src/app/settings/profile.component.html b/apps/web/src/app/settings/profile.component.html
index bdc6932ee4f..c7184985df3 100644
--- a/apps/web/src/app/settings/profile.component.html
+++ b/apps/web/src/app/settings/profile.component.html
@@ -30,16 +30,6 @@
           readonly
         />
       </div>
-      <div class="form-group" *ngIf="!hidePasswordHint">
-        <label for="masterPasswordHint">{{ "masterPassHintLabel" | i18n }}</label>
-        <input
-          id="masterPasswordHint"
-          class="form-control"
-          type="text"
-          name="MasterPasswordHint"
-          [(ngModel)]="profile.masterPasswordHint"
-        />
-      </div>
     </div>
     <div class="col-6">
       <div class="mb-3">
diff --git a/apps/web/src/app/settings/profile.component.ts b/apps/web/src/app/settings/profile.component.ts
index f93cc340ad6..fc7a56632ea 100644
--- a/apps/web/src/app/settings/profile.component.ts
+++ b/apps/web/src/app/settings/profile.component.ts
@@ -18,7 +18,6 @@ export class ProfileComponent implements OnInit {
   loading = true;
   profile: ProfileResponse;
   fingerprint: string;
-  hidePasswordHint = false;
 
   formPromise: Promise<any>;
 
@@ -41,7 +40,6 @@ export class ProfileComponent implements OnInit {
     if (fingerprint != null) {
       this.fingerprint = fingerprint.join("-");
     }
-    this.hidePasswordHint = await this.keyConnectorService.getUsesKeyConnector();
   }
 
   async submit() {
diff --git a/libs/common/src/models/request/passwordRequest.ts b/libs/common/src/models/request/passwordRequest.ts
index 9f7df7df373..eb3498a27f5 100644
--- a/libs/common/src/models/request/passwordRequest.ts
+++ b/libs/common/src/models/request/passwordRequest.ts
@@ -2,5 +2,6 @@ import { SecretVerificationRequest } from "./secretVerificationRequest";
 
 export class PasswordRequest extends SecretVerificationRequest {
   newMasterPasswordHash: string;
+  masterPasswordHint: string;
   key: string;
 }