Index: backend/backend/settings.py
===================================================================
--- backend/backend/settings.py	(revision 8eaa412c2519ea23247b7a68d8318046bbfa135a)
+++ backend/backend/settings.py	(revision 7ddc618be128e5f7b49f1d3747bad5c14fea6fde)
@@ -56,5 +56,5 @@
 
 SIMPLE_JWT = {
-    'ACCESS_TOKEN_LIFETIME': timedelta(minutes=1),
+    'ACCESS_TOKEN_LIFETIME': timedelta(seconds=30),
     'REFRESH_TOKEN_LIFETIME': timedelta(days=1),
     'ROTATE_REFRESH_TOKENS': True,
Index: frontend/src/components/StudentForm.tsx
===================================================================
--- frontend/src/components/StudentForm.tsx	(revision 8eaa412c2519ea23247b7a68d8318046bbfa135a)
+++ frontend/src/components/StudentForm.tsx	(revision 7ddc618be128e5f7b49f1d3747bad5c14fea6fde)
@@ -322,6 +322,6 @@
           <p className="text-gray-500 italic">
             {!studyTrack
-              ? "Избери смер и година за да се прикажат предметите"
-              : "Нема задолжителни предмети за избраниот смер и година"}
+              ? "Избери смер и година за да се прикажат предметите."
+              : "Нема задолжителни предмети за избраниот смер и година."}
           </p>
         )}
Index: frontend/src/context/AuthProvider.tsx
===================================================================
--- frontend/src/context/AuthProvider.tsx	(revision 8eaa412c2519ea23247b7a68d8318046bbfa135a)
+++ frontend/src/context/AuthProvider.tsx	(revision 7ddc618be128e5f7b49f1d3747bad5c14fea6fde)
@@ -3,32 +3,4 @@
 import axios from "axios";
 
-const refreshAccessToken = async (): Promise<string | null> => {
-  const refreshToken = localStorage.getItem("refresh_token");
-  console.log(refreshToken);
-  if (!refreshToken) {
-    return null;
-  }
-  try {
-    const response = await axios.post<{ access: string; refresh?: string }>(
-      "http://localhost:8000/auth/refresh/",
-      { refresh: refreshToken }
-    );
-    console.log(response);
-
-    const newAccessToken = response.data.access;
-
-    localStorage.setItem("access_token", newAccessToken);
-
-    if (response.data.refresh) {
-      const newRefreshToken = response.data.refresh;
-      localStorage.setItem("refresh_token", newRefreshToken);
-    }
-
-    return newAccessToken;
-  } catch (error) {
-    console.error("Error refrershing access token:", error);
-    return null;
-  }
-};
 export const AuthProvider: React.FC<{ children: ReactNode }> = ({
   children,
@@ -40,4 +12,30 @@
     localStorage.getItem("refresh_token")
   );
+  const refreshAccessToken = async (): Promise<string | null> => {
+    const refreshToken = localStorage.getItem("refresh_token")
+    if (!refreshToken) {
+      return null;
+    }
+    try {
+      const response = await axios.post<{ access: string; refresh?: string }>(
+        "http://localhost:8000/auth/refresh/",
+        { refresh: refreshToken }
+      );
+
+      const newAccessToken = response.data.access;
+      localStorage.setItem("access_token", newAccessToken);
+      setAccessToken(newAccessToken);
+      if (response.data.refresh) {
+        const newRefreshToken = response.data.refresh;
+        localStorage.setItem("refresh_token", newRefreshToken);
+        setRefreshToken(newRefreshToken);
+      }
+
+      return newAccessToken;
+    } catch (error) {
+      console.error("Error refrershing access token:", error);
+      return null;
+    }
+  };
   useEffect(() => {
     const storedAccessToken = localStorage.getItem("access_token");
@@ -49,5 +47,5 @@
 
     if (storedRefreshToken !== refreshToken) {
-      setAccessToken(storedRefreshToken);
+      setRefreshToken(storedRefreshToken);
     }
   }, [accessToken, refreshToken]);
Index: frontend/src/hooks/useAxiosAuth.ts
===================================================================
--- frontend/src/hooks/useAxiosAuth.ts	(revision 8eaa412c2519ea23247b7a68d8318046bbfa135a)
+++ frontend/src/hooks/useAxiosAuth.ts	(revision 7ddc618be128e5f7b49f1d3747bad5c14fea6fde)
@@ -23,6 +23,7 @@
           originalRequest._retry = true;
           const newToken = await refreshAccessToken();
-
+          localStorage.setItem("access_token", newToken || "");
           if (newToken) {
+            axiosInstance.defaults.headers.common['Authorization'] = `Bearer ${newToken}`;
             originalRequest.headers["Authorization"] = `Bearer ${newToken}`;
             return axiosInstance(originalRequest);
Index: frontend/src/pages/Account.tsx
===================================================================
--- frontend/src/pages/Account.tsx	(revision 8eaa412c2519ea23247b7a68d8318046bbfa135a)
+++ frontend/src/pages/Account.tsx	(revision 7ddc618be128e5f7b49f1d3747bad5c14fea6fde)
@@ -31,5 +31,5 @@
     };
     checkToken();
-  }, [refreshAccessToken]);
+  }, [refreshAccessToken, navigate]);
 
   useEffect(() => {
@@ -38,5 +38,4 @@
         return;
       }
-      console.log(accessToken);
       try {
         const resForm = await axiosInstance.get("/auth/form/");