diff --git a/packages/next/src/views/Login/index.tsx b/packages/next/src/views/Login/index.tsx
index 38b810a5a..bbdc3e414 100644
--- a/packages/next/src/views/Login/index.tsx
+++ b/packages/next/src/views/Login/index.tsx
@@ -46,7 +46,7 @@ export const LoginView: React.FC<AdminViewProps> = ({ initPageResult, params, se
   const mappedAfterLogins = createMappedComponent(afterLogin, undefined, undefined, 'afterLogin')
 
   if (user) {
-    redirect(admin)
+    redirect((searchParams.redirect as string) || admin)
   }
 
   const collectionConfig = collections.find(({ slug }) => slug === userSlug)
diff --git a/packages/next/src/views/Logout/LogoutClient.tsx b/packages/next/src/views/Logout/LogoutClient.tsx
index 43cee5044..f08e54d66 100644
--- a/packages/next/src/views/Logout/LogoutClient.tsx
+++ b/packages/next/src/views/Logout/LogoutClient.tsx
@@ -18,7 +18,8 @@ export const LogoutClient: React.FC<{
 }> = (props) => {
   const { adminRoute, inactivity, redirect } = props
 
-  const [isLoggedOut, setIsLoggedOut] = React.useState<boolean | undefined>(undefined)
+  const { logOut, user } = useAuth()
+  const [isLoggedOut, setIsLoggedOut] = React.useState<boolean>(!user)
   const logOutSuccessRef = React.useRef(false)
   const [loginRoute] = React.useState(() =>
     formatAdminURL({
@@ -30,7 +31,7 @@ export const LogoutClient: React.FC<{
       }`,
     }),
   )
-  const { logOut } = useAuth()
+
   const { t } = useTranslation()
   const router = useRouter()
 
diff --git a/packages/ui/src/providers/Auth/index.tsx b/packages/ui/src/providers/Auth/index.tsx
index eb8401d64..8e04ad979 100644
--- a/packages/ui/src/providers/Auth/index.tsx
+++ b/packages/ui/src/providers/Auth/index.tsx
@@ -296,6 +296,7 @@ export function AuthProvider({
 
       forceLogOut = setTimeout(() => {
         setNewUser(null)
+        redirectToInactivityRoute()
       }, forceLogOutInTimeFromNow)
     }