Index: ChapterX.API/Controllers/CommentsController.cs
===================================================================
--- ChapterX.API/Controllers/CommentsController.cs	(revision b373fea3e2c9d404606002f8e7ba265a82d68187)
+++ ChapterX.API/Controllers/CommentsController.cs	(revision 0b502c2664f4d6c64626f3394b4f1dc540e0aa9b)
@@ -6,5 +6,4 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 
@@ -65,5 +64,5 @@
         public async Task<ActionResult> Add([FromBody] AddRequest request)
         {
-            var callerId = int.Parse(User.FindFirstValue(JwtRegisteredClaimNames.Sub)!);
+            var callerId = int.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier)!);
             _logger.LogInformation("Adding a new comment");
             var response = await _mediator.Send(request with { UserId = callerId });
@@ -81,5 +80,5 @@
             }
 
-            var callerId = int.Parse(User.FindFirstValue(JwtRegisteredClaimNames.Sub)!);
+            var callerId = int.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier)!);
             var response = await _mediator.Send(request with { CallerId = callerId });
             return Ok(response);
@@ -91,5 +90,5 @@
         {
             _logger.LogInformation("Deleting comment with ID: {CommentId}", id);
-            var callerId = int.Parse(User.FindFirstValue(JwtRegisteredClaimNames.Sub)!);
+            var callerId = int.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier)!);
             var response = await _mediator.Send(new DeleteRequest(id, callerId));
             return Ok(response);