diff --git a/src/Core/Repositories/EntityFramework/OrganizationRepository.cs b/src/Core/Repositories/EntityFramework/OrganizationRepository.cs
index b7e9ccbaf6..ea5cbc50fb 100644
--- a/src/Core/Repositories/EntityFramework/OrganizationRepository.cs
+++ b/src/Core/Repositories/EntityFramework/OrganizationRepository.cs
@@ -101,7 +101,7 @@ namespace Bit.Core.Repositories.EntityFramework
             using (var scope = ServiceScopeFactory.CreateScope())
             {
                 var dbContext = GetDatabaseContext(scope);
-                var orgUser = dbContext.FindAsync<EFModel.Organization>(organization.Id);
+                var orgEntity = await dbContext.FindAsync<EFModel.Organization>(organization.Id);
                 var sponsorships = dbContext.OrganizationSponsorships
                     .Where(os =>
                         os.SponsoringOrganizationId == organization.Id ||
@@ -115,7 +115,7 @@ namespace Bit.Core.Repositories.EntityFramework
                     sponsorship.SponsoringOrganizationId = UpdatedOrgId(sponsorship.SponsoringOrganizationId);
                 }
 
-                dbContext.Remove(orgUser);
+                dbContext.Remove(orgEntity);
                 await dbContext.SaveChangesAsync();
             }
         }
diff --git a/src/Core/Repositories/EntityFramework/OrganizationUserRepository.cs b/src/Core/Repositories/EntityFramework/OrganizationUserRepository.cs
index 2be24d83b1..8cc3f4f2eb 100644
--- a/src/Core/Repositories/EntityFramework/OrganizationUserRepository.cs
+++ b/src/Core/Repositories/EntityFramework/OrganizationUserRepository.cs
@@ -73,7 +73,7 @@ namespace Bit.Core.Repositories.EntityFramework
             using (var scope = ServiceScopeFactory.CreateScope())
             {
                 var dbContext = GetDatabaseContext(scope);
-                var orgUser = dbContext.FindAsync<EfModel.OrganizationUser>(organizationUserId);
+                var orgUser = await dbContext.FindAsync<EfModel.OrganizationUser>(organizationUserId);
                 var sponsorships = dbContext.OrganizationSponsorships
                     .Where(os => os.SponsoringOrganizationUserId != default &&
                         os.SponsoringOrganizationUserId.Value == organizationUserId);
diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_DeleteById.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_DeleteById.sql
index 5817e49394..0b4611a7d2 100644
--- a/src/Sql/dbo/Stored Procedures/OrganizationUser_DeleteById.sql	
+++ b/src/Sql/dbo/Stored Procedures/OrganizationUser_DeleteById.sql	
@@ -34,7 +34,7 @@ BEGIN
     WHERE
         [OrganizationUserId] = @Id
 
-    EXEC [dbo].[OrganizationUser_DeleteById] @Id
+    EXEC [dbo].[OrganizationSponsorship_OrganizationUserDeleted] @Id
 
     DELETE
     FROM
diff --git a/util/Migrator/DbScripts/2021-11-02_00_OrganizationSponsorship.sql b/util/Migrator/DbScripts/2021-11-02_00_OrganizationSponsorship.sql
index 079aacd924..9cb6ff1ae7 100644
--- a/util/Migrator/DbScripts/2021-11-02_00_OrganizationSponsorship.sql
+++ b/util/Migrator/DbScripts/2021-11-02_00_OrganizationSponsorship.sql
@@ -512,7 +512,7 @@ BEGIN
     WHERE
         [OrganizationUserId] = @Id
 
-    EXEC [dbo].[OrganizationUser_DeleteById] @Id
+    EXEC [dbo].[OrganizationSponsorship_OrganizationUserDeleted] @Id
 
     DELETE
     FROM