diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
index 76a9456c870..2e0a81da976 100644
--- a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
@@ -15,9 +15,10 @@
         <span class="tw-sr-only">{{ "loading" | i18n }}</span>
       </div>
     } @else {
-      <bit-callout type="warning">{{
+      <!-- TODO: PM-22237 -->
+      <!-- <bit-callout type="warning">{{
         "emergencyAccessLoggedOutWarning" | i18n: dialogData.grantorName
-      }}</bit-callout>
+      }}</bit-callout> -->
 
       <auth-input-password
         [flow]="inputPasswordFlow"
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index af30943dcd7..777104092fd 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -5785,6 +5785,9 @@
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
diff --git a/libs/auth/src/angular/input-password/input-password.component.html b/libs/auth/src/angular/input-password/input-password.component.html
index fd1c56983c6..b5a9f5a56e9 100644
--- a/libs/auth/src/angular/input-password/input-password.component.html
+++ b/libs/auth/src/angular/input-password/input-password.component.html
@@ -1,7 +1,11 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <auth-password-callout
     *ngIf="masterPasswordPolicyOptions"
-    [message]="message || 'masterPasswordPolicyInEffect'"
+    [message]="
+      flow === InputPasswordFlow.ChangePasswordDelegation
+        ? 'changePasswordDelegationMasterPasswordPolicyInEffect'
+        : 'masterPasswordPolicyInEffect'
+    "
     [policy]="masterPasswordPolicyOptions"
   ></auth-password-callout>
 
diff --git a/libs/auth/src/angular/input-password/input-password.component.ts b/libs/auth/src/angular/input-password/input-password.component.ts
index 79edfb32846..bd3a015055b 100644
--- a/libs/auth/src/angular/input-password/input-password.component.ts
+++ b/libs/auth/src/angular/input-password/input-password.component.ts
@@ -131,7 +131,6 @@ export class InputPasswordComponent implements OnInit {
   @Input() userId?: UserId;
   @Input() loading = false;
   @Input() masterPasswordPolicyOptions: MasterPasswordPolicyOptions | null = null;
-  @Input() message: string = "";
 
   @Input() inlineButtons = false;
   @Input() primaryButtonText?: Translation;