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 dc94dd35e8..97c2ebe779 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
@@ -111,7 +111,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                     u =>
                         u.UserName.Contains(filter) ||
                         u.Email.Contains(filter) ||
-                        (u.PhoneNumber != null && u.PhoneNumber.Contains(filter))
+                        (u.Name != null && u.Name.Contains(filter)) ||
+                        (u.Surname != null && u.Surname.Contains(filter))
                 )
                 .OrderBy(sorting ?? nameof(IdentityUser.UserName))
                 .PageBy(skipCount, maxResultCount)
@@ -139,7 +140,9 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                     !filter.IsNullOrWhiteSpace(),
                     u =>
                         u.UserName.Contains(filter) ||
-                        u.Email.Contains(filter)
+                        u.Email.Contains(filter) ||
+                        (u.Name != null && u.Name.Contains(filter)) ||
+                        (u.Surname != null && u.Surname.Contains(filter))
                 )
                 .LongCountAsync(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 52a345b0c4..e87d6aacfc 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
@@ -101,7 +101,8 @@ namespace Volo.Abp.Identity.MongoDB
                     u =>
                         u.UserName.Contains(filter) ||
                         u.Email.Contains(filter) ||
-                        (u.PhoneNumber != null && u.PhoneNumber.Contains(filter))
+                        (u.Name != null && u.Name.Contains(filter)) ||
+                        (u.Surname != null && u.Surname.Contains(filter))
                 )
                 .OrderBy(sorting ?? nameof(IdentityUser.UserName))
                 .As<IMongoQueryable<IdentityUser>>()
@@ -128,7 +129,9 @@ namespace Volo.Abp.Identity.MongoDB
                     !filter.IsNullOrWhiteSpace(),
                     u =>
                         u.UserName.Contains(filter) ||
-                        u.Email.Contains(filter)
+                        u.Email.Contains(filter) ||
+                        (u.Name != null && u.Name.Contains(filter)) ||
+                        (u.Surname != null && u.Surname.Contains(filter))
                 )
                 .LongCountAsync(GetCancellationToken(cancellationToken));
         }
diff --git a/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs b/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs
index f5eb013c93..f84577406e 100644
--- a/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs
+++ b/modules/users/src/Volo.Abp.Users.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs
@@ -32,7 +32,7 @@ namespace Volo.Abp.Users.EntityFrameworkCore
 
         public async Task<List<TUser>> SearchAsync(
             string sorting = null, 
-            int maxResultCount = Int32.MaxValue, 
+            int maxResultCount = int.MaxValue, 
             int skipCount = 0,
             string filter = null,
             CancellationToken cancellationToken = default)
@@ -42,7 +42,9 @@ namespace Volo.Abp.Users.EntityFrameworkCore
                     !filter.IsNullOrWhiteSpace(),
                     u =>
                         u.UserName.Contains(filter) ||
-                        u.Email.Contains(filter)
+                        u.Email.Contains(filter) ||
+                        u.Name.Contains(filter) ||
+                        u.Surname.Contains(filter)
                 )
                 .OrderBy(sorting ?? nameof(IUser.UserName))
                 .PageBy(skipCount, maxResultCount)
diff --git a/modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs b/modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs
index 3cb6e567ae..4a5eed6a8a 100644
--- a/modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs
+++ b/modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs
@@ -31,7 +31,11 @@ namespace Volo.Abp.Users.MongoDB
             return await GetMongoQueryable().Where(u => ids.Contains(u.Id)).ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<TUser>> SearchAsync(string sorting = null, int maxResultCount = Int32.MaxValue, int skipCount = 0, string filter = null,
+        public async Task<List<TUser>> SearchAsync(
+            string sorting = null, 
+            int maxResultCount = int.MaxValue, 
+            int skipCount = 0,
+            string filter = null,
             CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable()
@@ -39,7 +43,9 @@ namespace Volo.Abp.Users.MongoDB
                     !filter.IsNullOrWhiteSpace(),
                     u =>
                         u.UserName.Contains(filter) ||
-                        u.Email.Contains(filter)
+                        u.Email.Contains(filter) ||
+                        u.Name.Contains(filter) ||
+                        u.Surname.Contains(filter)
                 )
                 .OrderBy(sorting ?? nameof(IUserData.UserName))
                 .As<IMongoQueryable<TUser>>()