diff --git a/exercise.wwwapi/Endpoints/UserEndpoints.cs b/exercise.wwwapi/Endpoints/UserEndpoints.cs
index 3573b00..7520bbc 100644
--- a/exercise.wwwapi/Endpoints/UserEndpoints.cs
+++ b/exercise.wwwapi/Endpoints/UserEndpoints.cs
@@ -389,7 +389,9 @@ private static string CreateToken(User user, IConfigurationSettings configuratio
             new(ClaimTypes.Sid, user.Id.ToString()),
             new(ClaimTypes.Name, user.Username),
             new(ClaimTypes.Email, user.Email),
-            new(ClaimTypes.Role, user.Role.ToString())
+            new(ClaimTypes.Role, user.Role.ToString()),
+            new("FirstName", user.FirstName),
+            new("LastName", user.LastName)
         };
 
         var tokenKey = Environment.GetEnvironmentVariable(Globals.EnvironmentEnvVariable) == "Staging"