diff --git a/app/components/Layout/Navigation.tsx b/app/components/Layout/Navigation.tsx
index d922267a47..6529daee86 100644
--- a/app/components/Layout/Navigation.tsx
+++ b/app/components/Layout/Navigation.tsx
@@ -39,19 +39,19 @@ const Navigation: React.FC<Props> = ({
       {userProfileComponent}
       <LogoutForm />
     </>
-  ) : router.pathname === "/" ? (
-    isLoggedIn
   ) : (
-    <div
-      style={{
-        display: "flex",
-        flexDirection: "row",
-        gap: "1.25em",
-      }}
-    >
-      <LoginForm />
-      {showExternalOperatorsLogin && <LoginForm isExternal={true} />}
-    </div>
+    router.pathname !== "/" && (
+      <div
+        style={{
+          display: "flex",
+          flexDirection: "row",
+          gap: "1.25em",
+        }}
+      >
+        <LoginForm />
+        {showExternalOperatorsLogin && <LoginForm isExternal={true} />}
+      </div>
+    )
   );
 
   const unauthorizedIdir = title === "Access required";
diff --git a/app/components/Session/LoginForm.tsx b/app/components/Session/LoginForm.tsx
index 7ac78fcac1..124f0f2e9a 100644
--- a/app/components/Session/LoginForm.tsx
+++ b/app/components/Session/LoginForm.tsx
@@ -9,33 +9,30 @@ interface Props {
 
 const LoginForm: React.FC<Props> = ({ isExternal }) => {
   const router = useRouter();
-  let loginURI = isExternal
-    ? `/login?redirectTo=${getExternalUserLandingPageRoute().pathname}`
-    : "/login";
+  let loginURI = "/login";
 
   if (router.query.redirectTo)
     loginURI += `?redirectTo=${encodeURIComponent(
       router.query.redirectTo as string
     )}`;
+  else if (isExternal)
+    loginURI += `?redirectTo=${encodeURIComponent(
+      getExternalUserLandingPageRoute().pathname as string
+    )}`;
 
   return (
     <>
       <form id="login-buttons" action={loginURI} method="post">
-        {isExternal && router.pathname.includes("login-redirect") ? (
-          <Button type="submit" variant="secondary-inverse">
-            External User Login
-          </Button>
-        ) : isExternal ? (
-          <Button type="submit" variant="secondary">
-            External User Login
-          </Button>
-        ) : router.pathname.includes("login-redirect") ? (
-          <Button type="submit" variant="secondary-inverse">
-            Administrator Login
-          </Button>
-        ) : (
-          <Button type="submit">Administrator Login</Button>
-        )}
+        <Button
+          type="submit"
+          variant={
+            router.pathname.includes("login-redirect")
+              ? "secondary-inverse"
+              : isExternal && "secondary"
+          }
+        >
+          {isExternal ? "External User Login" : "Administrator Login"}
+        </Button>
       </form>
       <style jsx>{`
         #login-buttons {