diff --git a/src/features/auth/ClusterInstanceSignIn.tsx b/src/features/auth/ClusterInstanceSignIn.tsx
index b2f9ff2dd..3a7f49f86 100644
--- a/src/features/auth/ClusterInstanceSignIn.tsx
+++ b/src/features/auth/ClusterInstanceSignIn.tsx
@@ -23,6 +23,7 @@ import { getOperationsUrlForInstance } from '@/lib/urls/getOperationsUrlForInsta
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useQuery } from '@tanstack/react-query';
 import { Link, Navigate, useParams } from '@tanstack/react-router';
+import { cx } from 'class-variance-authority';
 import { useMemo } from 'react';
 import { useForm } from 'react-hook-form';
 
@@ -100,8 +101,13 @@ export function ClusterInstanceSignIn() {
 					<Breadcrumbs />
 				</nav>
 			)}
-			<div className="h-screen items-center justify-center flex">
-				<div className="text-white w-xs">
+			<div
+				className={cx(
+					isLocalStudio ? 'min-h-screen' : 'mt-32 min-h-[calc(100vh-(--spacing(32)))]',
+					'items-center justify-center flex',
+				)}
+			>
+				<div className="text-white w-xs py-8">
 					<h2 className="text-2xl font-light">
 						Sign in to Harper {properNoun}
 					</h2>
diff --git a/src/features/clusters/components/ClusterCard.tsx b/src/features/clusters/components/ClusterCard.tsx
index 92062cac1..85fdeaf29 100644
--- a/src/features/clusters/components/ClusterCard.tsx
+++ b/src/features/clusters/components/ClusterCard.tsx
@@ -145,6 +145,11 @@ export function ClusterCard({ cluster }: { cluster: Cluster }) {
 				</DropdownMenuItem>
 			</Link>
 		),
+		isActive && view && !!operationsUrl && !auth.isLoading && isDirectConnect && (
+			<DropdownMenuItem key="direct-sign-out" onClick={onSignOutClick} disabled={signingOut}>
+				Direct Sign Out
+			</DropdownMenuItem>
+		),
 		isActive && update && (
 			<Link key="edit" to={`${cluster.id}/edit`} disabled={signingOut}>
 				<DropdownMenuItem>
@@ -186,11 +191,6 @@ export function ClusterCard({ cluster }: { cluster: Cluster }) {
 			</DropdownMenuItem>
 		),
 
-		isActive && view && !!operationsUrl && !auth.isLoading && isDirectConnect && (
-			<DropdownMenuItem key="direct-sign-out" onClick={onSignOutClick} disabled={signingOut}>
-				Direct Sign Out
-			</DropdownMenuItem>
-		),
 		clusterHasFailed && create && (
 			<DropdownMenuItem key="try-again" className="focus:bg-green/70 focus:text-white" onClick={onTryAgainClick}>
 				Try Again
diff --git a/src/features/clusters/components/ClusterCardAction.tsx b/src/features/clusters/components/ClusterCardAction.tsx
index 3f13621d2..d6d4f98d3 100644
--- a/src/features/clusters/components/ClusterCardAction.tsx
+++ b/src/features/clusters/components/ClusterCardAction.tsx
@@ -7,12 +7,17 @@ import { Cluster } from '@/integrations/api/api.patch';
 import { clusterIsSelfManaged } from '@/integrations/api/clusterIsSelfManaged';
 import { Link } from '@tanstack/react-router';
 import { ArrowRight } from 'lucide-react';
+import { useCallback } from 'react';
 
 export function ClusterCardAction({ cluster }: { cluster: Cluster }) {
 	const auth = useInstanceAuth(cluster.id);
 	const { view, update } = useOrganizationClusterPermissions(cluster.organizationId, cluster.id);
 	const isFabricConnect = authStore.checkForFabricConnect(cluster.id);
 	const isDirectConnect = !isFabricConnect && !!auth.user;
+	const prepareForDirectSignIn = useCallback(() => {
+		authStore.setUserForEntity(cluster, null);
+		authStore.flagForFabricConnect(cluster.id, false);
+	}, [cluster]);
 
 	if (!view) {
 		return undefined;
@@ -95,6 +100,7 @@ export function ClusterCardAction({ cluster }: { cluster: Cluster }) {
 			className="text-sm text-nowrap"
 			aria-label={`Sign In to ${cluster.name}`}
 			title={`Sign In to ${cluster.name}`}
+			onClick={prepareForDirectSignIn}
 		>
 			<span className="py-2 hover:border-b-2">
 				Direct Sign In <ArrowRight className="inline-block" />