diff --git a/src/RAG.Api/Endpoints/Users/GetUserListEndpoint.cs b/src/RAG.Api/Endpoints/Users/GetUserListEndpoint.cs
index 239f22a..ed1e698 100644
--- a/src/RAG.Api/Endpoints/Users/GetUserListEndpoint.cs
+++ b/src/RAG.Api/Endpoints/Users/GetUserListEndpoint.cs
@@ -5,7 +5,12 @@ using RAG.Application.Users.Queries;
 
 namespace RAG.Api.Endpoints.Users;
 
-public class GetUserListEndpoint(IMediator mediator) : EndpointWithoutRequest<List<UserDto>>
+public record GetUserListRequest
+{
+    public string? Search { get; init; }
+}
+
+public class GetUserListEndpoint(IMediator mediator) : Endpoint<GetUserListRequest, List<UserDto>>
 {
     public override void Configure()
     {
@@ -13,9 +18,9 @@ public class GetUserListEndpoint(IMediator mediator) : EndpointWithoutRequest<Li
         Permissions("user:read");
     }
 
-    public override async Task HandleAsync(CancellationToken ct)
+    public override async Task HandleAsync(GetUserListRequest req, CancellationToken ct)
     {
-        var result = await mediator.Send(new GetUserListQuery(), ct);
+        var result = await mediator.Send(new GetUserListQuery(req.Search), ct);
         await Send.OkAsync(result, ct);
     }
 }
diff --git a/src/RAG.Application/Users/Queries/GetUserListQuery.cs b/src/RAG.Application/Users/Queries/GetUserListQuery.cs
index 5488ac7..2511ca8 100644
--- a/src/RAG.Application/Users/Queries/GetUserListQuery.cs
+++ b/src/RAG.Application/Users/Queries/GetUserListQuery.cs
@@ -5,14 +5,24 @@ using RAG.Infrastructure.Persistence;
 
 namespace RAG.Application.Users.Queries;
 
-public record GetUserListQuery : IRequest<List<UserDto>>;
+public record GetUserListQuery(string? Search) : IRequest<List<UserDto>>;
 
 public class GetUserListQueryHandler(RagDbContext db) : IRequestHandler<GetUserListQuery, List<UserDto>>
 {
     public async Task<List<UserDto>> Handle(GetUserListQuery request, CancellationToken ct)
     {
-        return await db.Users
+        var query = db.Users
             .Include(u => u.UserRoles).ThenInclude(ur => ur.Role)
+            .AsQueryable();
+
+        if (!string.IsNullOrWhiteSpace(request.Search))
+        {
+            var search = request.Search.ToLower();
+            query = query.Where(u => u.Username.ToLower().Contains(search)
+                || u.Email.ToLower().Contains(search));
+        }
+
+        return await query
             .Select(u => new UserDto(
                 u.Id, u.Username, u.Email, u.IsActive, u.CreatedAt,
                 u.UserRoles.Select(ur => ur.Role.Name).ToList()))