diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs
index b437d9fae9..1326626262 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs
@@ -11,7 +11,6 @@ using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Domain.Services;
 using Volo.Abp.Identity.Organizations;
-using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Threading;
 using Volo.Abp.Uow;
 using Volo.Abp.Settings;
@@ -123,7 +122,7 @@ namespace Volo.Abp.Identity
 
         public virtual async Task AddToOrganizationUnitAsync(IdentityUser user, OrganizationUnit ou)
         {
-            await _identityUserRepository.EnsureCollectionLoadedAsync(user, u => u.OrganizationUnits, _cancellationTokenProvider.Token).ConfigureAwait(false);
+            await _identityUserRepository.EnsureCollectionLoadedAsync(user, u => u.OrganizationUnits, CancellationTokenProvider.Token).ConfigureAwait(false);
             
             var currentOus = user.OrganizationUnits;
 
@@ -147,7 +146,7 @@ namespace Volo.Abp.Identity
 
         public virtual async Task RemoveFromOrganizationUnitAsync(IdentityUser user, OrganizationUnit ou)
         {
-            await _identityUserRepository.EnsureCollectionLoadedAsync(user, u => u.OrganizationUnits, _cancellationTokenProvider.Token).ConfigureAwait(false);
+            await _identityUserRepository.EnsureCollectionLoadedAsync(user, u => u.OrganizationUnits, CancellationTokenProvider.Token).ConfigureAwait(false);
 
             user.RemoveOrganizationUnit(ou.Id);
         }
@@ -203,7 +202,7 @@ namespace Volo.Abp.Identity
         [UnitOfWork]
         public virtual async Task<List<OrganizationUnit>> GetOrganizationUnitsAsync(IdentityUser user)
         {
-            await _identityUserRepository.EnsureCollectionLoadedAsync(user, u => u.OrganizationUnits, _cancellationTokenProvider.Token).ConfigureAwait(false);
+            await _identityUserRepository.EnsureCollectionLoadedAsync(user, u => u.OrganizationUnits, CancellationTokenProvider.Token).ConfigureAwait(false);
 
             var ouOfUser = user.OrganizationUnits;
 
@@ -211,7 +210,8 @@ namespace Volo.Abp.Identity
         }
 
         [UnitOfWork]
-        public virtual async Task<List<IdentityUser>> GetUsersInOrganizationUnitAsync(OrganizationUnit organizationUnit, bool includeChildren = false)
+        public virtual async Task<List<IdentityUser>> GetUsersInOrganizationUnitAsync(OrganizationUnit organizationUnit,
+            bool includeChildren = false)
         {
             if (includeChildren)
             {
@@ -225,6 +225,7 @@ namespace Volo.Abp.Identity
                     .GetUsersInOrganizationUnitAsync(organizationUnit.Id)
                     .ConfigureAwait(false);
             }
+        }
 
         public virtual async Task<IdentityResult> AddDefaultRolesAsync([NotNull] IdentityUser user)
         {
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
index cccf524031..c13d3f33bd 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
@@ -366,9 +366,9 @@ namespace Volo.Abp.Identity
 
             Check.NotNull(user, nameof(user));
 
-            var userRoles = await _userRepository.GetRoleNamesAsync(user.Id, cancellationToken: cancellationToken);
+            var userRoles = await UserRepository.GetRoleNamesAsync(user.Id, cancellationToken: cancellationToken);
 
-            var userOrganizationUnitRoles = await _userRepository.GetRoleNamesInOrganizationUnitAsync(user.Id, cancellationToken: cancellationToken);
+            var userOrganizationUnitRoles = await UserRepository.GetRoleNamesInOrganizationUnitAsync(user.Id, cancellationToken: cancellationToken);
 
             return userRoles.Union(userOrganizationUnitRoles).ToList();
         }
diff --git a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs
index ff880f0ecc..2d259b0859 100644
--- a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs
+++ b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs
@@ -118,10 +118,11 @@ namespace Volo.Abp.Identity
                 await uow.CompleteAsync().ConfigureAwait(false);
 
 
+            }
         }
-        
-           [Fact]
-                public async Task AddDefaultRolesAsync_In_Same_Uow()
+
+        [Fact]
+        public async Task AddDefaultRolesAsync_In_Same_Uow()
         {
             await CreateRandomDefaultRoleAsync();
 
@@ -146,6 +147,7 @@ namespace Volo.Abp.Identity
                 await uow.CompleteAsync();
 
             }
+        }
 
         [Fact]
         public async Task SetOrganizationUnits_Should_Remove()
@@ -175,8 +177,8 @@ namespace Volo.Abp.Identity
             }
         }
 
-   [Fact]
-public async Task AddDefaultRolesAsync_In_Different_Uow()
+        [Fact]
+        public async Task AddDefaultRolesAsync_In_Different_Uow()
         {
             await CreateRandomDefaultRoleAsync();