diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs
index 4434821c09..3c9a9fe788 100644
--- a/src/Api/Controllers/OrganizationsController.cs
+++ b/src/Api/Controllers/OrganizationsController.cs
@@ -384,15 +384,17 @@ namespace Bit.Api.Controllers
                 throw new NotFoundException();
             }
 
+            var user = await _userService.GetUserByPrincipalAsync(User);
+
             var ssoConfig = await _ssoConfigRepository.GetByOrganizationIdAsync(orgGuidId);
             if (ssoConfig?.GetData()?.KeyConnectorEnabled == true &&
-                _currentContext.User.UsesKeyConnector)
+                user.UsesKeyConnector)
             {
                 throw new BadRequestException("Your organization's Single Sign-On settings prevent you from leaving.");
             }
 
-            var userId = _userService.GetProperUserId(User);
-            await _organizationService.DeleteUserAsync(orgGuidId, userId.Value);
+            
+            await _organizationService.DeleteUserAsync(orgGuidId, user.Id);
         }
 
         [HttpDelete("{id}")]
diff --git a/test/Api.Test/Controllers/OrganizationsControllerTests.cs b/test/Api.Test/Controllers/OrganizationsControllerTests.cs
index 480e475531..ba3096e96a 100644
--- a/test/Api.Test/Controllers/OrganizationsControllerTests.cs
+++ b/test/Api.Test/Controllers/OrganizationsControllerTests.cs
@@ -72,8 +72,7 @@ namespace Bit.Api.Test.Controllers
 
             _currentContext.OrganizationUser(orgId).Returns(true);
             _ssoConfigRepository.GetByOrganizationIdAsync(orgId).Returns(ssoConfig);
-            _userService.GetProperUserId(Arg.Any<ClaimsPrincipal>()).Returns(user.Id);
-            _currentContext.User.Returns(user);
+            _userService.GetUserByPrincipalAsync(Arg.Any<ClaimsPrincipal>()).Returns(user);
 
             var exception = await Assert.ThrowsAsync<BadRequestException>(
                 () => _sut.Leave(orgId.ToString()));
@@ -106,8 +105,7 @@ namespace Bit.Api.Test.Controllers
 
             _currentContext.OrganizationUser(orgId).Returns(true);
             _ssoConfigRepository.GetByOrganizationIdAsync(orgId).Returns(ssoConfig);
-            _userService.GetProperUserId(Arg.Any<ClaimsPrincipal>()).Returns(user.Id);
-            _currentContext.User.Returns(user);
+            _userService.GetUserByPrincipalAsync(Arg.Any<ClaimsPrincipal>()).Returns(user);
 
             await _organizationService.DeleteUserAsync(orgId, user.Id);
             await _organizationService.Received(1).DeleteUserAsync(orgId, user.Id);