diff --git a/portal-ui/src/screens/LoginPage/LoginPage.tsx b/portal-ui/src/screens/LoginPage/LoginPage.tsx
index b37f4f6ff..804db6e0e 100644
--- a/portal-ui/src/screens/LoginPage/LoginPage.tsx
+++ b/portal-ui/src/screens/LoginPage/LoginPage.tsx
@@ -296,10 +296,12 @@ const Login = () => {
     loginStrategy.loginStrategy === loginStrategyType.serviceAccount ||
     loginStrategy.loginStrategy === loginStrategyType.redirectServiceAccount;
 
-  if (navigateTo !== "") {
-    navigate(navigateTo);
-    dispatch(resetForm());
-  }
+  useEffect(() => {
+    if (navigateTo !== "") {
+      dispatch(resetForm());
+      navigate(navigateTo);
+    }
+  }, [navigateTo, dispatch, navigate]);
 
   const formSubmit = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();