diff --git a/CarCareTracker.csproj b/CarCareTracker.csproj
index 3aae8aa..d8e1835 100644
--- a/CarCareTracker.csproj
+++ b/CarCareTracker.csproj
@@ -11,11 +11,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="33.0.1" />
+    <PackageReference Include="CsvHelper" Version="33.1.0" />
     <PackageReference Include="LiteDB" Version="5.0.17" />
-    <PackageReference Include="MailKit" Version="4.11.0" />
+    <PackageReference Include="MailKit" Version="4.13.0" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
     <PackageReference Include="Npgsql" Version="9.0.3" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/Controllers/LoginController.cs b/Controllers/LoginController.cs
index 3fe0439..81de884 100644
--- a/Controllers/LoginController.cs
+++ b/Controllers/LoginController.cs
@@ -4,7 +4,7 @@ using CarCareTracker.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Mvc;
-using System.IdentityModel.Tokens.Jwt;
+using Microsoft.IdentityModel.JsonWebTokens;
 using System.Text.Json;
 
 namespace CarCareTracker.Controllers
@@ -146,8 +146,8 @@ namespace CarCareTracker.Controllers
                     if (!string.IsNullOrWhiteSpace(userJwt))
                     {
                         //validate JWT token
-                        var tokenParser = new JwtSecurityTokenHandler();
-                        var parsedToken = tokenParser.ReadJwtToken(userJwt);
+                        var tokenParser = new JsonWebTokenHandler();
+                        var parsedToken = tokenParser.ReadJsonWebToken(userJwt);
                         var userEmailAddress = string.Empty;
                         if (parsedToken.Claims.Any(x => x.Type == "email"))
                         {
@@ -274,8 +274,8 @@ namespace CarCareTracker.Controllers
                     {
                         results.Add(OperationResponse.Succeed($"Passed JWT Parsing - id_token: {userJwt}"));
                         //validate JWT token
-                        var tokenParser = new JwtSecurityTokenHandler();
-                        var parsedToken = tokenParser.ReadJwtToken(userJwt);
+                        var tokenParser = new JsonWebTokenHandler();
+                        var parsedToken = tokenParser.ReadJsonWebToken(userJwt);
                         var userEmailAddress = string.Empty;
                         if (parsedToken.Claims.Any(x => x.Type == "email"))
                         {