diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
index 91e1d8e4c49..7ca7e796d87 100644
--- a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
@@ -38,7 +38,7 @@ import {
 } from "./emergency-access-add-edit.component";
 import {
   EmergencyAccessTakeoverDialogComponent,
-  EmergencyAccessTakeoverDialogResultType,
+  EmergencyAccessTakeoverDialogResultTypes,
 } from "./takeover/emergency-access-takeover-dialog.component";
 import {
   EmergencyAccessTakeoverComponent,
@@ -309,7 +309,7 @@ export class EmergencyAccessComponent implements OnInit {
         },
       });
       const result = await lastValueFrom(dialogRef.closed);
-      if (result === EmergencyAccessTakeoverDialogResultType.Done) {
+      if (result === EmergencyAccessTakeoverDialogResultTypes.Done) {
         this.toastService.showToast({
           variant: "success",
           title: null,
diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
index d6df320564a..3e391091abe 100644
--- a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
@@ -34,10 +34,12 @@ type EmergencyAccessTakeoverDialogData = {
   emergencyAccessId: string;
 };
 
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum EmergencyAccessTakeoverDialogResultType {
-  Done = "done",
-}
+export const EmergencyAccessTakeoverDialogResultTypes = {
+  Done: "done",
+} as const;
+
+type EmergencyAccessTakeoverDialogResultType =
+  (typeof EmergencyAccessTakeoverDialogResultTypes)[keyof typeof EmergencyAccessTakeoverDialogResultTypes];
 
 /**
  * This component is used by a Grantee to take over emergency access of a Grantor's account
@@ -109,7 +111,7 @@ export class EmergencyAccessTakeoverDialogComponent implements OnInit {
       });
     }
 
-    this.dialogRef.close(EmergencyAccessTakeoverDialogResultType.Done);
+    this.dialogRef.close(EmergencyAccessTakeoverDialogResultTypes.Done);
   }
 
   /**
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 8cd44f9d627..8f01dbbd501 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -109,7 +109,7 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.PM19941MigrateCipherDomainToSdk]: FALSE,
 
   /* Auth */
-  [FeatureFlag.PM16117_ChangeExistingPasswordRefactor]: FALSE,
+  [FeatureFlag.PM16117_ChangeExistingPasswordRefactor]: true,
   [FeatureFlag.PM9115_TwoFactorExtensionDataPersistence]: FALSE,
 
   /* Billing */