diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx
index 6404daf1e..99901e3a0 100644
--- a/src/frontend/src/App.tsx
+++ b/src/frontend/src/App.tsx
@@ -14,10 +14,8 @@ import { alertContext } from "./contexts/alertContext";
 import { AuthContext } from "./contexts/authContext";
 import { locationContext } from "./contexts/locationContext";
 import { TabsContext } from "./contexts/tabsContext";
-import { getLoggedUser, onLogin } from "./controllers/API";
+import { autoLogin, getLoggedUser, onLogin } from "./controllers/API";
 import Router from "./routes";
-import { LOCALHOST_JWT } from "./constants/constants";
-import { LoginType } from "./types/api";
 
 export default function App() {
   let { setCurrent, setShowSideBar, setIsStackedOpen } =
@@ -133,52 +131,32 @@ export default function App() {
   };
 
   //this function is to get the user logged in when the page is refreshed
-  const { setUserData, getAuthentication, login } = useContext(AuthContext);
+  const { setUserData, getAuthentication, login, setAutoLogin } = useContext(AuthContext);
+
   useEffect(() => {
     setTimeout(() => {
-      if (getAuthentication && !isLoginPage) {
-        getLoggedUser()
-          .then((user) => {
-            setUserData(user);
-          })
-          .catch((error) => {});
-      }
-    }, 1000);
+      autoLogin().then((user) => {
+        if(user && user['access_token']){
+          user['refresh_token'] = "auto";
+          login(user['access_token'], user['refresh_token']);
+          setAutoLogin(true);
+        }
+      }).catch((error) => {
+        setAutoLogin(false);
+        if (getAuthentication && !isLoginPage) {
+          getLoggedUser()
+            .then((user) => {
+              setUserData(user);
+            })
+            .catch((error) => {});
+        }
+        else{
+          navigate("/login");
+        }
+      });
+    }, 500);
   }, []);
 
-  useEffect(() => {
-
-    if(LOCALHOST_JWT === true && isLocalHost === true){
-      const user: LoginType = {
-        username: "superuser",
-        password: "12345",
-      };
-      onLogin(user)
-        .then((user) => {
-          login(user.access_token, user.refresh_token);
-          getUser();
-          navigate("/");
-        })
-        .catch((error) => {
-          setErrorData({
-            title: "Error signing in",
-            list: [error["response"]["data"]["detail"]],
-          });
-        });
-    }
-  }, [])
-
-  function getUser() {
-    if (getAuthentication) {
-      setTimeout(() => {
-        getLoggedUser()
-          .then((user) => {
-            setUserData(user);
-          })
-          .catch((error) => {});
-      }, 1000);
-    }
-  }
 
   return (
     //need parent component with width and height
diff --git a/src/frontend/src/components/PaginatorComponent/index.tsx b/src/frontend/src/components/PaginatorComponent/index.tsx
index 295b4d7c8..0bb40fa60 100644
--- a/src/frontend/src/components/PaginatorComponent/index.tsx
+++ b/src/frontend/src/components/PaginatorComponent/index.tsx
@@ -65,10 +65,6 @@ export default function PaginatorComponent({
               <span className="sr-only">Go to first page</span>
               <IconComponent name="ChevronsLeft" className="h-4 w-4" />
             </Button>
-
-
-
-
             <Button
               disabled={index <= 0}
               onClick={() => {
@@ -85,10 +81,6 @@ export default function PaginatorComponent({
               <span className="sr-only">Go to previous page</span>
               <IconComponent name="ChevronLeft" className="h-4 w-4" />
             </Button>
-
-
-
-
             <Button
               disabled={currentPage === maxIndex}
               onClick={() => {
@@ -103,10 +95,6 @@ export default function PaginatorComponent({
               <span className="sr-only">Go to next page</span>
               <IconComponent name="ChevronRight" className="h-4 w-4" />
             </Button>
-
-
-
-
             <Button
               disabled={currentPage === maxIndex}
               variant="outline"
diff --git a/src/frontend/src/components/authLoginGuard/index.tsx b/src/frontend/src/components/authLoginGuard/index.tsx
index 1c9165422..229f9b284 100644
--- a/src/frontend/src/components/authLoginGuard/index.tsx
+++ b/src/frontend/src/components/authLoginGuard/index.tsx
@@ -1,14 +1,11 @@
 import { useContext } from "react";
 import { Navigate } from "react-router-dom";
 import { AuthContext } from "../../contexts/authContext";
-import { LOCALHOST_JWT } from "../../constants/constants";
 
 export const ProtectedLoginRoute = ({ children }) => {
-  const { getAuthentication } = useContext(AuthContext);
+  const { getAuthentication, autoLogin } = useContext(AuthContext);
 
-  const isLocalHost = window.location.href.includes("localhost");
-
-  if(isLocalHost && LOCALHOST_JWT){
+  if(autoLogin === true){
     window.location.replace("/");
     return <Navigate to="/" replace />;
   }
diff --git a/src/frontend/src/components/headerComponent/index.tsx b/src/frontend/src/components/headerComponent/index.tsx
index 45b80ffa9..56e7ff16d 100644
--- a/src/frontend/src/components/headerComponent/index.tsx
+++ b/src/frontend/src/components/headerComponent/index.tsx
@@ -2,7 +2,7 @@ import { useContext, useEffect, useState } from "react";
 import { FaDiscord, FaGithub, FaTwitter } from "react-icons/fa";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import AlertDropdown from "../../alerts/alertDropDown";
-import { LOCALHOST_JWT, USER_PROJECTS_HEADER } from "../../constants/constants";
+import { USER_PROJECTS_HEADER } from "../../constants/constants";
 import { alertContext } from "../../contexts/alertContext";
 import { AuthContext } from "../../contexts/authContext";
 import { darkContext } from "../../contexts/darkContext";
@@ -18,11 +18,10 @@ export default function Header() {
   const { dark, setDark } = useContext(darkContext);
   const { notificationCenter } = useContext(alertContext);
   const location = useLocation();
-  const { logout } = useContext(AuthContext);
+  const { logout, autoLogin } = useContext(AuthContext);
   const navigate = useNavigate();
 
   const [stars, setStars] = useState(null);
-  const isLocalHost = window.location.href.includes("localhost");
 
   // Get and set numbers of stars on header
   useEffect(() => {
@@ -38,7 +37,7 @@ export default function Header() {
         <Link to="/">
           <span className="ml-4 text-2xl">⛓️</span>
         </Link>
-        {!isLocalHost || !LOCALHOST_JWT && (
+        {autoLogin === false && (
           <Button
             onClick={() => {
               logout();
diff --git a/src/frontend/src/constants/constants.ts b/src/frontend/src/constants/constants.ts
index 426335e35..a8881d7a5 100644
--- a/src/frontend/src/constants/constants.ts
+++ b/src/frontend/src/constants/constants.ts
@@ -610,5 +610,3 @@ export function tabsArray(codes: string[], method: number) {
 }
 
 export const BASE_URL_API = "http://localhost:7860/";
-
-export let LOCALHOST_JWT = false;
\ No newline at end of file
diff --git a/src/frontend/src/contexts/authContext.tsx b/src/frontend/src/contexts/authContext.tsx
index 18baa0ae2..b1f5d31f7 100644
--- a/src/frontend/src/contexts/authContext.tsx
+++ b/src/frontend/src/contexts/authContext.tsx
@@ -14,6 +14,8 @@ const initialValue: AuthContextType = {
   setUserData: () => {},
   getAuthentication: () => false,
   authenticationErrorCount: 0,
+  autoLogin: false,
+  setAutoLogin: () => {},
 };
 
 export const AuthContext = createContext<AuthContextType>(initialValue);
@@ -23,6 +25,7 @@ export function AuthProvider({ children }): React.ReactElement {
   const [refreshToken, setRefreshToken] = useState<string | null>(null);
   const [isAuthenticated, setIsAuthenticated] = useState<boolean>(false);
   const [userData, setUserData] = useState<Users>(null);
+  const [autoLogin, setAutoLogin] = useState<boolean>(false);
   const cookies = new Cookies();
 
   useEffect(() => {
@@ -91,6 +94,8 @@ export function AuthProvider({ children }): React.ReactElement {
         userData,
         getAuthentication,
         authenticationErrorCount: 0,
+        setAutoLogin,
+        autoLogin
       }}
     >
       {children}
diff --git a/src/frontend/src/controllers/API/api.tsx b/src/frontend/src/controllers/API/api.tsx
index dad3b3b41..2318891c4 100644
--- a/src/frontend/src/controllers/API/api.tsx
+++ b/src/frontend/src/controllers/API/api.tsx
@@ -80,6 +80,10 @@ function ApiInterceptor() {
           config?.url?.includes(
             "https://api.github.com/repos/logspace-ai/langflow"
           )
+          ||
+          config?.url?.includes(
+            "auto_login"
+          )
         ) {
           delete config.headers["Authorization"];
         }
diff --git a/src/frontend/src/controllers/API/index.ts b/src/frontend/src/controllers/API/index.ts
index 2f7f95cda..0590b5aa6 100644
--- a/src/frontend/src/controllers/API/index.ts
+++ b/src/frontend/src/controllers/API/index.ts
@@ -378,6 +378,21 @@ export async function onLogin(user: LoginType) {
   }
 }
 
+export async function autoLogin() {
+  try {
+    const response = await api.get(
+      `${BASE_URL_API}auto_login`
+    );
+
+    if (response.status === 200) {
+      const data = response.data;
+      return data;
+    }
+  } catch (error) {
+    throw error;
+  }
+}
+
 export async function renewAccessToken(token: string) {
   try {
     return await api.post(`${BASE_URL_API}refresh?token=${token}`);
diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx
index f7b34da57..6eb606dd2 100644
--- a/src/frontend/src/pages/AdminPage/index.tsx
+++ b/src/frontend/src/pages/AdminPage/index.tsx
@@ -266,7 +266,7 @@ export default function AdminPage() {
                         <TableRow>
                           <TableHead className="h-10">Id</TableHead>
                           <TableHead className="h-10">Username</TableHead>
-                          <TableHead className="h-10">Disabled</TableHead>
+                          <TableHead className="h-10">Active</TableHead>
                           <TableHead className="h-10">Superuser</TableHead>
                           <TableHead className="h-10">Created At</TableHead>
                           <TableHead className="h-10">Updated At</TableHead>
@@ -304,7 +304,7 @@ export default function AdminPage() {
                                   index={index}
                                   onConfirm={(index, user) => {
                                     handleDisableUser(
-                                      user.is_superuser,
+                                      user.is_active,
                                       user.id,
                                       user
                                     );
diff --git a/src/frontend/src/types/contexts/auth.ts b/src/frontend/src/types/contexts/auth.ts
index 496baeb29..c40a5a39e 100644
--- a/src/frontend/src/types/contexts/auth.ts
+++ b/src/frontend/src/types/contexts/auth.ts
@@ -11,4 +11,6 @@ export type AuthContextType = {
   setUserData: (userData: Users | null) => void;
   getAuthentication: () => boolean;
   authenticationErrorCount: number;
+  autoLogin: boolean;
+  setAutoLogin: (autoLogin: boolean) => void
 };