diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/ControllerExtensions.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/ControllerExtensions.cs
index a897824b..1121a9b8 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/ControllerExtensions.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/ControllerExtensions.cs
@@ -5,20 +5,20 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers
 {
     public static class ControllerExtensions
     {
-        public static int? GetId(this ControllerBase controller)
-            => int.TryParse(controller.User.FindFirst(ClaimTypes.NameIdentifier)?.Value, out int result)
+        public static int? GetId(this ClaimsPrincipal user)
+            => int.TryParse(user.FindFirst(ClaimTypes.NameIdentifier)?.Value, out int result)
                 ? result : null;
         
-        public static string? GetUsername(this ControllerBase controller)
-            => controller.User.FindFirst(ClaimTypes.Name)?.Value;
+        public static string? GetUsername(this ClaimsPrincipal user)
+            => user.FindFirst(ClaimTypes.Name)?.Value;
         
-        public static string? GetName(this ControllerBase controller)
-            => controller.User.FindFirst(ClaimTypes.Surname)?.Value;
+        public static string? GetName(this ClaimsPrincipal user)
+            => user.FindFirst(ClaimTypes.Surname)?.Value;
         
-        public static string? GetPrename(this ControllerBase controller)
-            => controller.User.FindFirst(ClaimTypes.GivenName)?.Value;
+        public static string? GetPrename(this ClaimsPrincipal user)
+            => user.FindFirst(ClaimTypes.GivenName)?.Value;
         
-        public static string? GetEmail(this ControllerBase controller)
-            => controller.User.FindFirst(ClaimTypes.Email)?.Value;
+        public static string? GetEmail(this ClaimsPrincipal user)
+            => user.FindFirst(ClaimTypes.Email)?.Value;
     }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
index 1c3dcd14..652f7f08 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs
@@ -24,7 +24,7 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers
         {
             try
             {
-                var id = this.GetId();
+                var id = User.GetId();
 
                 if (id is int intId)
                     return await _envelopeService.ReadByIdAsync(intId).ThenAsync(
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
index faa85852..d10194d9 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
@@ -24,12 +24,12 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers
         {
             try
             {
-                var username = this.GetUsername();
+                var username = User.GetUsername();
 
                 if (username is null)
                 {
                     _logger.LogError(@"Envelope Receiver dto cannot be sent because username claim is null. Potential authentication and authorization error. The value of other claims are [id: {id}], [username: {username}], [name: {name}], [prename: {prename}], [email: {email}].",
-                        this.GetId(), this.GetUsername(), this.GetName(), this.GetPrename(), this.GetEmail());
+                        User.GetId(), User.GetUsername(), User.GetName(), User.GetPrename(), User.GetEmail());
                     return StatusCode(StatusCodes.Status500InternalServerError);
                 }