diff --git a/AutoStack.Presentation/Endpoints/EmailVerification/EmailVerificationEndpoints.cs b/AutoStack.Presentation/Endpoints/EmailVerification/EmailVerificationEndpoints.cs
index dd69308..fbc6ab1 100644
--- a/AutoStack.Presentation/Endpoints/EmailVerification/EmailVerificationEndpoints.cs
+++ b/AutoStack.Presentation/Endpoints/EmailVerification/EmailVerificationEndpoints.cs
@@ -15,12 +15,10 @@ public static void MapEmailVerificationEndpoints(this IEndpointRouteBuilder app)
 
         group.MapPost("/verify", VerifyEmail)
             .WithName("VerifyEmail")
-            .WithSummary("Verify email with 6-digit code")
-            .RequireAuthorization()
+            .WithSummary("Verify email with 6-digit code and userId")
             .RequireRateLimiting("email-verify")
             .Produces(200)
             .Produces(400)
-            .Produces(401)
             .Produces(429);
 
         group.MapPost("/resend", ResendVerificationEmail)
@@ -43,17 +41,10 @@ public static void MapEmailVerificationEndpoints(this IEndpointRouteBuilder app)
 
     private static async Task<IResult> VerifyEmail(
         VerifyEmailRequest request,
-        HttpContext context,
         IMediator mediator,
         CancellationToken cancellationToken)
     {
-        var userId = GetUserIdFromClaims(context);
-        if (userId == null)
-        {
-            return Results.Unauthorized();
-        }
-
-        var command = new VerifyEmailCommand(userId.Value, request.Code);
+        var command = new VerifyEmailCommand(request.UserId, request.Code);
         var result = await mediator.Send(command, cancellationToken);
 
         if (!result.IsSuccess)
@@ -69,7 +60,7 @@ private static async Task<IResult> VerifyEmail(
         return Results.Ok(new
         {
             success = true,
-            message = "Email verified successfully"
+            message = "Email verified successfully! You can now login."
         });
     }
 
@@ -141,4 +132,4 @@ private static async Task<IResult> GetVerificationStatus(
     }
 }
 
-public record VerifyEmailRequest(string Code);
+public record VerifyEmailRequest(Guid UserId, string Code);