diff --git a/src/modules/Elsa.Identity/Endpoints/Login/Endpoint.cs b/src/modules/Elsa.Identity/Endpoints/Login/Endpoint.cs
index 5ccdcf2a6..8b9de8316 100644
--- a/src/modules/Elsa.Identity/Endpoints/Login/Endpoint.cs
+++ b/src/modules/Elsa.Identity/Endpoints/Login/Endpoint.cs
@@ -25,7 +25,7 @@ public class Login : Endpoint<Request, LoginResponse>
     /// <inheritdoc />
     public override async Task<LoginResponse> ExecuteAsync(Request request, CancellationToken cancellationToken)
     {
-        var user = await _userCredentialsValidator.ValidateAsync(request.Username.Trim(), request.Password.Trim(), cancellationToken);
+        var user = await _userCredentialsValidator.ValidateAsync(request.Username?.Trim(), request.Password?.Trim(), cancellationToken);
 
         if (user == null)
             return new LoginResponse(false, null, null);