diff --git a/handlers/jwt.go b/handlers/jwt.go
index 0bc0592..5d94fe8 100644
--- a/handlers/jwt.go
+++ b/handlers/jwt.go
@@ -16,6 +16,7 @@ import (
 	"log"
 	"os"
 	"sort"
+	"strconv"
 	"time"
 
 	"github.com/golang-jwt/jwt/v5"
@@ -242,6 +243,8 @@ func generateAccessToken(email, sessionID, userID string, roleID []int) (string,
 		AccessTokenExpiration = "45"
 	}
 
+	log.Print("AccessTokenExpiration (minutes):", AccessTokenExpiration)
+
 	if roleID == nil {
 		roleID = []int{}
 	}
@@ -255,7 +258,13 @@ func generateAccessToken(email, sessionID, userID string, roleID []int) (string,
 		}
 	}
 
-	expirationTime := time.Now().Add(24 * time.Hour).Unix()
+	expirationMinutes, err := strconv.Atoi(AccessTokenExpiration)
+	if err != nil {
+		log.Println("Invalid AccessTokenExpiration value, defaulting to 45 minutes")
+		expirationMinutes = 45
+	}
+
+	expirationTime := time.Now().Add(time.Duration(expirationMinutes) * time.Minute).Unix()
 
 	claims := &models.AccessToken{
 		Email:            email,