diff --git a/src/Server/Controllers/MAuth.cs b/src/Server/Controllers/MAuth.cs
index c43359d..17f75d0 100644
--- a/src/Server/Controllers/MAuth.cs
+++ b/src/Server/Controllers/MAuth.cs
@@ -15,8 +15,6 @@ namespace Auth.Controllers {
 
         public MAuthController(DatabaseService db) : base(db) { }
 
-        static Dictionary<string, JWTMemCache> LoginSessions = new Dictionary<string, JWTMemCache>();
-
         // Login and return a ticket to retreive your JWT
         [HttpPost("login")]
         public async Task<ActionResult> Authenticate([FromBody] LoginRequest request) {
@@ -34,9 +32,9 @@ namespace Auth.Controllers {
                             await _databaseService.SetAccount(test);
 
                             string Ticket = Guid.NewGuid().ToString().Replace("-", "");
-                            LoginSessions[Ticket] = new JWTMemCache {
+                            AuthJWT.LoginSessions[Ticket] = new JWTMemCache {
                                 JWT = AuthJWT.GenereateJWTToken(test, request.StayLoggedIn),
-                                ExpiresAt = DateTime.UtcNow.AddMinutes(2)
+                                ExpiresAt = DateTime.UtcNow.AddSeconds(30)
                             };
 
                             return Ok(Ticket);
@@ -57,16 +55,16 @@ namespace Auth.Controllers {
         }
 
         [HttpPost("token")]
-        public ActionResult Token([FromForm] JWTRequest request) {
+        public ActionResult Token([FromBody] JWTRequest request) {
             try {
-                if (LoginSessions.ContainsKey(request.Ticket)) {
-                    JWTMemCache JWTObj = LoginSessions[request.Ticket];
-                    if (JWTObj.ExpiresAt < DateTime.UtcNow) {
+                if (AuthJWT.LoginSessions.ContainsKey(request.Ticket)) {
+                    JWTMemCache JWTObj = AuthJWT.LoginSessions[request.Ticket];
+                    if (JWTObj.ExpiresAt >= DateTime.UtcNow) {
                         string JWT = JWTObj.JWT;
-                        LoginSessions.Remove(request.Ticket);
+                        AuthJWT.LoginSessions.Remove(request.Ticket);
                         return Ok(JWT);
                     } else {
-                        LoginSessions.Remove(request.Ticket);
+                        AuthJWT.LoginSessions.Remove(request.Ticket);
                         return BadRequest("The session ticket has already expired");
                     }
                 }
diff --git a/src/Server/Services/AuthJWT.cs b/src/Server/Services/AuthJWT.cs
index 8024c55..d3be245 100644
--- a/src/Server/Services/AuthJWT.cs
+++ b/src/Server/Services/AuthJWT.cs
@@ -1,13 +1,13 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Security.Cryptography;
-using System.Text;
 using Auth.Entities;
 using Microsoft.IdentityModel.Tokens;
 
 namespace Auth.Services {
     public class AuthJWT {
 
+        public static Dictionary<string, JWTMemCache> LoginSessions = new Dictionary<string, JWTMemCache>();
         public static RsaSecurityKey RsaPublicKey = LoadRSAKey("/certs/public_key.pem");
         public static RsaSecurityKey RsaPrivateKey = LoadRSAKey("/certs/private_key.pem");