diff --git a/src/Core/AdminConsole/Services/Implementations/PolicyService.cs b/src/Core/AdminConsole/Services/Implementations/PolicyService.cs
index 9abb9cd618..0bf92e16df 100644
--- a/src/Core/AdminConsole/Services/Implementations/PolicyService.cs
+++ b/src/Core/AdminConsole/Services/Implementations/PolicyService.cs
@@ -92,12 +92,12 @@ public class PolicyService : IPolicyService
 
         OrganizationUserType[] excludedUserTypes;
 
-        if (policyType == PolicyType.SingleOrg
-            && _featureService.IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
-            && await GetPoliciesApplicableToUserAsync(userId, PolicyType.AutomaticUserConfirmation, OrganizationUserStatusType.Revoked) is { Count: > 0 })
+        if (policyType == PolicyType.SingleOrg // looking for single org
+            && _featureService.IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers) // if autoconfirm is enabled
+            && (await _organizationUserRepository.GetByUserIdWithPolicyDetailsAsync(userId, PolicyType.AutomaticUserConfirmation)).Any()) // any auto confirm details associated with user id
         {
-            minStatus = OrganizationUserStatusType.Revoked;
-            excludedUserTypes = [];
+            minStatus = OrganizationUserStatusType.Revoked; // all statuses count
+            excludedUserTypes = []; // no excluded types
         }
         else
         {
diff --git a/test/Core.Test/AdminConsole/Services/PolicyServiceTests.cs b/test/Core.Test/AdminConsole/Services/PolicyServiceTests.cs
index 33f4841eb3..c2d713317d 100644
--- a/test/Core.Test/AdminConsole/Services/PolicyServiceTests.cs
+++ b/test/Core.Test/AdminConsole/Services/PolicyServiceTests.cs
@@ -143,7 +143,7 @@ public class PolicyServiceTests
             .IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
             .Returns(true);
 
-        // Setup recursive call - user has AutomaticUserConfirmation policy
+        // Mock repository call - user has AutomaticUserConfirmation policy details
         var autoConfirmPolicies = new List<OrganizationUserPolicyDetails>
         {
             new() { OrganizationId = Guid.NewGuid(), PolicyType = PolicyType.AutomaticUserConfirmation, PolicyEnabled = true, OrganizationUserType = OrganizationUserType.User, OrganizationUserStatus = OrganizationUserStatusType.Revoked, IsProvider = false }
@@ -187,7 +187,7 @@ public class PolicyServiceTests
             .IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
             .Returns(true);
 
-        // Setup recursive call - user has AutomaticUserConfirmation policy
+        // Mock repository call - user has AutomaticUserConfirmation policy details
         var autoConfirmPolicies = new List<OrganizationUserPolicyDetails>
         {
             new() { OrganizationId = Guid.NewGuid(), PolicyType = PolicyType.AutomaticUserConfirmation, PolicyEnabled = true, OrganizationUserType = OrganizationUserType.User, OrganizationUserStatus = OrganizationUserStatusType.Confirmed, IsProvider = false }
@@ -266,7 +266,7 @@ public class PolicyServiceTests
             .IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
             .Returns(true);
 
-        // Setup recursive call - user has NO AutomaticUserConfirmation policy
+        // Mock repository call - user has NO AutomaticUserConfirmation policy details
         sutProvider.GetDependency<IOrganizationUserRepository>()
             .GetByUserIdWithPolicyDetailsAsync(userId, PolicyType.AutomaticUserConfirmation)
             .Returns(new List<OrganizationUserPolicyDetails>());