diff --git a/src/auth/RequireAuth.tsx b/src/auth/RequireAuth.tsx
index 5ebd34a..835bd74 100644
--- a/src/auth/RequireAuth.tsx
+++ b/src/auth/RequireAuth.tsx
@@ -12,7 +12,7 @@ const RequireAuth = () => {
     return <ScreenLoader />;
   }
 
-  return auth ? <Outlet /> : <Navigate to="/auth/login" state={{ from: location }} replace />;
+  return auth ? <Outlet /> : <Navigate to="/auth/login" replace />;
 };
 
 export { RequireAuth };
diff --git a/src/auth/pages/jwt/Login.tsx b/src/auth/pages/jwt/Login.tsx
index bea522e..28a283f 100644
--- a/src/auth/pages/jwt/Login.tsx
+++ b/src/auth/pages/jwt/Login.tsx
@@ -121,7 +121,7 @@ const Login = () => {
               })}
               onKeyPress={handleKeyPress}
             />
-            <button className="btn btn-icon" onClick={togglePassword}>
+            <button className="btn btn-icon" onClick={togglePassword} type="button">
               <KeenIcon icon="eye" className={clsx('text-gray-500', { hidden: showPassword })} />
               <KeenIcon
                 icon="eye-slash"