diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommand.cs
index d6ff444af1..33f280cca8 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommand.cs
@@ -246,17 +246,17 @@ public class AcceptOrgUserCommand : IAcceptOrgUserCommand
             {
                 throw new BadRequestException("You cannot join this organization until you enable two-step login on your user account.");
             }
+
+            return;
         }
-        else
+
+        if (!await _twoFactorIsEnabledQuery.TwoFactorIsEnabledAsync(user))
         {
-            if (!await _twoFactorIsEnabledQuery.TwoFactorIsEnabledAsync(user))
+            var invitedTwoFactorPolicies = await _policyService.GetPoliciesApplicableToUserAsync(user.Id,
+                PolicyType.TwoFactorAuthentication, OrganizationUserStatusType.Invited);
+            if (invitedTwoFactorPolicies.Any(p => p.OrganizationId == organizationId))
             {
-                var invitedTwoFactorPolicies = await _policyService.GetPoliciesApplicableToUserAsync(user.Id,
-                    PolicyType.TwoFactorAuthentication, OrganizationUserStatusType.Invited);
-                if (invitedTwoFactorPolicies.Any(p => p.OrganizationId == organizationId))
-                {
-                    throw new BadRequestException("You cannot join this organization until you enable two-step login on your user account.");
-                }
+                throw new BadRequestException("You cannot join this organization until you enable two-step login on your user account.");
             }
         }
     }
diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ConfirmOrganizationUserCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ConfirmOrganizationUserCommand.cs
index 9086a437a9..806cf5a533 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ConfirmOrganizationUserCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ConfirmOrganizationUserCommand.cs
@@ -186,15 +186,15 @@ public class ConfirmOrganizationUserCommand : IConfirmOrganizationUserCommand
             {
                 throw new BadRequestException("User does not have two-step login enabled.");
             }
+
+            return;
         }
-        else
+
+        var orgRequiresTwoFactor = (await _policyService.GetPoliciesApplicableToUserAsync(user.Id, PolicyType.TwoFactorAuthentication))
+            .Any(p => p.OrganizationId == organizationId);
+        if (orgRequiresTwoFactor && !userTwoFactorEnabled)
         {
-            var orgRequiresTwoFactor = (await _policyService.GetPoliciesApplicableToUserAsync(user.Id, PolicyType.TwoFactorAuthentication))
-                .Any(p => p.OrganizationId == organizationId);
-            if (orgRequiresTwoFactor && !userTwoFactorEnabled)
-            {
-                throw new BadRequestException("User does not have two-step login enabled.");
-            }
+            throw new BadRequestException("User does not have two-step login enabled.");
         }
     }