diff --git a/src/Api/Models/Response/ProfileOrganizationResponseModel.cs b/src/Api/Models/Response/ProfileOrganizationResponseModel.cs
index 94ef68c263..b8895fdc92 100644
--- a/src/Api/Models/Response/ProfileOrganizationResponseModel.cs
+++ b/src/Api/Models/Response/ProfileOrganizationResponseModel.cs
@@ -28,6 +28,8 @@ public class ProfileOrganizationResponseModel : ResponseModel
         UseSecretsManager = organization.UseSecretsManager;
         UsersGetPremium = organization.UsersGetPremium;
         UseCustomPermissions = organization.UseCustomPermissions;
+        UseActivateAutofillPolicy = organization.PlanType == PlanType.EnterpriseAnnually ||
+            organization.PlanType == PlanType.EnterpriseMonthly;
         SelfHost = organization.SelfHost;
         Seats = organization.Seats;
         MaxCollections = organization.MaxCollections;
@@ -78,6 +80,7 @@ public class ProfileOrganizationResponseModel : ResponseModel
     public bool UseSecretsManager { get; set; }
     public bool UsersGetPremium { get; set; }
     public bool UseCustomPermissions { get; set; }
+    public bool UseActivateAutofillPolicy { get; set; }
     public bool SelfHost { get; set; }
     public int? Seats { get; set; }
     public short? MaxCollections { get; set; }
diff --git a/src/Api/Models/Response/ProfileProviderOrganizationResponseModel.cs b/src/Api/Models/Response/ProfileProviderOrganizationResponseModel.cs
index 1d508cae17..d08e3b1ea4 100644
--- a/src/Api/Models/Response/ProfileProviderOrganizationResponseModel.cs
+++ b/src/Api/Models/Response/ProfileProviderOrganizationResponseModel.cs
@@ -24,6 +24,8 @@ public class ProfileProviderOrganizationResponseModel : ProfileOrganizationRespo
         UseResetPassword = organization.UseResetPassword;
         UsersGetPremium = organization.UsersGetPremium;
         UseCustomPermissions = organization.UseCustomPermissions;
+        UseActivateAutofillPolicy = organization.PlanType == PlanType.EnterpriseAnnually ||
+            organization.PlanType == PlanType.EnterpriseMonthly;
         SelfHost = organization.SelfHost;
         Seats = organization.Seats;
         MaxCollections = organization.MaxCollections;
diff --git a/src/Core/Enums/PolicyType.cs b/src/Core/Enums/PolicyType.cs
index e4c1208362..30dac3d917 100644
--- a/src/Core/Enums/PolicyType.cs
+++ b/src/Core/Enums/PolicyType.cs
@@ -13,4 +13,5 @@ public enum PolicyType : byte
     ResetPassword = 8,
     MaximumVaultTimeout = 9,
     DisablePersonalVaultExport = 10,
+    ActivateAutofill = 11,
 }
diff --git a/src/Core/Services/Implementations/PolicyService.cs b/src/Core/Services/Implementations/PolicyService.cs
index a8d4f7ac93..f7ba081b4b 100644
--- a/src/Core/Services/Implementations/PolicyService.cs
+++ b/src/Core/Services/Implementations/PolicyService.cs
@@ -73,6 +73,14 @@ public class PolicyService : IPolicyService
                     await DependsOnSingleOrgAsync(org);
                 }
                 break;
+
+            // Activate Autofill is only available to Enterprise 2020-current plans
+            case PolicyType.ActivateAutofill:
+                if (policy.Enabled)
+                {
+                    LockedTo2020Plan(org);
+                }
+                break;
         }
 
         var now = DateTime.UtcNow;
@@ -168,4 +176,12 @@ public class PolicyService : IPolicyService
             throw new BadRequestException("Maximum Vault Timeout policy is enabled.");
         }
     }
+
+    private void LockedTo2020Plan(Organization org)
+    {
+        if (org.PlanType != PlanType.EnterpriseAnnually && org.PlanType != PlanType.EnterpriseMonthly)
+        {
+            throw new BadRequestException("This policy is only available to 2020 Enterprise plans.");
+        }
+    }
 }