diff --git a/src/apis/APIAuth.js b/src/apis/APIAuth.js
index 58626bb9..af9a545c 100644
--- a/src/apis/APIAuth.js
+++ b/src/apis/APIAuth.js
@@ -32,7 +32,7 @@ export const APIAuth = {
     }
   },
   logout: (navigate) => {
-    authService.clearCredentialsFromCookie(navigate);
+    authService.clearCredentialsFromCookie();
     navigate("/");
   },
 };
diff --git a/src/components/layout-components/Sidebar.jsx b/src/components/layout-components/Sidebar.jsx
index 249d170d..938c9661 100644
--- a/src/components/layout-components/Sidebar.jsx
+++ b/src/components/layout-components/Sidebar.jsx
@@ -20,7 +20,6 @@ export default function Sidebar() {
   const selectedKeys = location.pathname.match(regex)[0];
 
   const openLogoutModal = () => {
-    console.log("Opening Logout Modal");
     setShowLogoutModal(true);
   };
 
diff --git a/src/services/AuthService.js b/src/services/AuthService.js
index 50f88520..b9d04596 100644
--- a/src/services/AuthService.js
+++ b/src/services/AuthService.js
@@ -14,15 +14,14 @@ export class AuthService {
         const token = Cookies.get("token");
         if (token) {
           const decoded = jwtDecode(token);
-          const currentTime = Date.now() / 1000;
-          return decoded.exp > currentTime;
+          // const currentTime = Date.now() / 1000;
+          // return decoded.exp < currentTime
+          return decoded.authorized;
         }
         return false;
       };
-
       if (!isTokenValid()) {
         this.clearCredentialsFromCookie();
-        return null;
       }
 
       return Cookies.get("token");
@@ -33,11 +32,11 @@ export class AuthService {
 
   storeCredentials({ token, isRemembered, data }) {
     if (!isRemembered) {
-      const expires = new Date(new Date().getTime() + 60 * 60 * 1000);
+      const expires = new Date(new Date().getTime() + 24 * 60 * 60 * 1000);
       Cookies.set("token", token, { expires });
       localStorage.removeItem("data");
     } else {
-      const expires = new Date(new Date().getTime() + 60 * 60 * 1000);
+      const expires = new Date(new Date().getTime() + 24 * 60 * 60 * 1000);
       Cookies.set("token", token, { expires });
       localStorage.setItem("data", JSON.stringify(data));
     }
diff --git a/src/views/auth-views/Login.jsx b/src/views/auth-views/Login.jsx
index 1af34238..43fa57fe 100644
--- a/src/views/auth-views/Login.jsx
+++ b/src/views/auth-views/Login.jsx
@@ -51,26 +51,28 @@ const Login = () => {
     const redirectTo = params.get("return_to");
     if (isRemembered) {
       try {
-        await APIAuth.loginWithRememberMe(data, isRemembered);
-        if (redirectTo) {
-          returnTo = `/${redirectTo}`;
-          return navigate(returnTo);
-        } else {
-          navigate(returnTo);
-        }
+        await APIAuth.loginWithRememberMe(data, isRemembered).then(() => {
+          if (redirectTo) {
+            returnTo = `/${redirectTo}`;
+            return navigate(returnTo);
+          } else {
+            navigate(returnTo);
+          }
+        });
       } catch (error) {
         console.error(error);
         showErrorToast(error.message, "top-right");
       }
     } else {
       try {
-        await APIAuth.login(data);
-        if (redirectTo) {
-          returnTo = `/${redirectTo}`;
-          return navigate(returnTo);
-        } else {
-          navigate(returnTo);
-        }
+        await APIAuth.login(data).then(() => {
+          if (redirectTo) {
+            returnTo = `/${redirectTo}`;
+            return navigate(returnTo);
+          } else {
+            navigate(returnTo);
+          }
+        });
       } catch (error) {
         console.error(error);
         showErrorToast(error.message, "top-right");
@@ -213,22 +215,13 @@ const Login = () => {
 
                 {/* Button */}
                 <div className="mt-16">
-                  {isSubmitting ? (
-                    <button
-                      id="submit-button"
-                      className="w-full rounded-lg bg-green-500 px-4 py-4 text-xl font-bold text-grey-10 hover:bg-green-600 disabled:bg-green-700"
-                      disabled
-                    >
-                      Masuk
-                    </button>
-                  ) : (
-                    <button
-                      id="submit-button"
-                      className="w-full rounded-lg bg-green-500 px-4 py-4 text-xl font-bold text-grey-10 hover:bg-green-600"
-                    >
-                      Masuk
-                    </button>
-                  )}
+                  <button
+                    id="submit-button"
+                    className="w-full rounded-lg bg-green-500 px-4 py-4 text-xl font-bold text-grey-10 hover:bg-green-600 disabled:bg-green-700"
+                    disabled={isSubmitting}
+                  >
+                    Masuk
+                  </button>
                 </div>
               </form>
             </div>