diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs
index d5d601330a..59d6087d06 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs
@@ -106,6 +106,7 @@ public interface IIdentityUserRepository : IBasicRepository<IdentityUser, Guid>
     Task<IdentityUser> FindByTenantIdAndUserNameAsync(
         Guid tenantId,
         [NotNull] string userName,
+        bool includeDetails = true,
         CancellationToken cancellationToken = default
     );
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs
index 12ebbd80b5..1b0cdc825b 100644
--- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs
@@ -303,9 +303,14 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
         return (await GetQueryableAsync()).IncludeDetails();
     }
 
-    public virtual async Task<IdentityUser> FindByTenantIdAndUserNameAsync(Guid tenantId, [NotNull] string userName, CancellationToken cancellationToken = default)
+    public virtual async Task<IdentityUser> FindByTenantIdAndUserNameAsync(
+        Guid tenantId, 
+        [NotNull] string userName,
+        bool includeDetails = true,
+        CancellationToken cancellationToken = default)
     {
         return await(await GetDbSetAsync())
+            .IncludeDetails(includeDetails)
             .FirstOrDefaultAsync(
                 u => u.TenantId == tenantId && u.UserName == userName,
                 GetCancellationToken(cancellationToken)
diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
index dbec50c147..01c92489f6 100644
--- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
@@ -271,7 +271,11 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
                  .ToListAsync(cancellationToken);
     }
 
-    public virtual async Task<IdentityUser> FindByTenantIdAndUserNameAsync(Guid tenantId, [NotNull] string userName, CancellationToken cancellationToken = default)
+    public virtual async Task<IdentityUser> FindByTenantIdAndUserNameAsync(
+        Guid tenantId, 
+        [NotNull] string userName, 
+        bool includeDetails = true, 
+        CancellationToken cancellationToken = default)
     {
         return await (await GetMongoQueryableAsync(cancellationToken))
             .FirstOrDefaultAsync(