diff --git a/esp/src/src-react/components/forms/Login.tsx b/esp/src/src-react/components/forms/Login.tsx
index 6b1d324b0fb..9937ee68394 100644
--- a/esp/src/src-react/components/forms/Login.tsx
+++ b/esp/src/src-react/components/forms/Login.tsx
@@ -120,7 +120,9 @@ export const Login: React.FunctionComponent<LoginProps> = ({
                     cookies["ESPAuthenticated"] = "true";
                     createUserSession(cookies).then(() => {
                         setErrorMessage("");
-                        replaceUrl("/", true);
+                        const lastUrl = window.localStorage.getItem("pageOnLock") ?? "/";
+                        window.localStorage.removeItem("pageOnLock");
+                        replaceUrl(lastUrl, true);
                     }).catch(err => logger.error("Unable to create user session."));
                 }
             }