diff --git a/apps/desktop/src/lib/components/EvmDashboard.svelte b/apps/desktop/src/lib/components/EvmDashboard.svelte
index 2aece46..5121dce 100644
--- a/apps/desktop/src/lib/components/EvmDashboard.svelte
+++ b/apps/desktop/src/lib/components/EvmDashboard.svelte
@@ -84,32 +84,7 @@
 
 {#if !w.ready}
 	<div class="mx-auto mt-16 max-w-md text-center text-muted-foreground text-sm">Loading...</div>
-{:else if !w.accountType}
-	<div class="mx-auto mt-24 max-w-sm">
-		<Card>
-			<CardHeader class="text-center">
-				<CardTitle>Welcome</CardTitle>
-				<CardDescription>Choose an account type to get started</CardDescription>
-			</CardHeader>
-			<CardContent>
-				<div class="flex flex-col gap-3">
-					<Button
-						onclick={() => w.login('multi')}
-						class="w-full">
-						Multi Coins (ETH / BSC / Polygon)
-					</Button>
-					<Button
-						onclick={() => navigate('/monero')}
-						variant="outline"
-						class="w-full">
-						Monero
-					</Button>
-				</div>
-			</CardContent>
-		</Card>
-	</div>
-{:else if w.accountType === 'multi'}
-	{#if !w.vaultExists}
+{:else if !w.vaultExists}
 		<Card>
 			<CardHeader>
 				<CardTitle>Import Wallet</CardTitle>
@@ -192,11 +167,6 @@
 						{net.name}
 					</button>
 				{/each}
-				<button
-					class="cursor-pointer rounded-md px-2.5 py-1 text-xs font-medium transition-colors bg-muted text-muted-foreground hover:bg-muted/80"
-					onclick={() => w.logout()}>
-					Logout
-				</button>
 			</div>
 
 			<Card>
@@ -291,8 +261,8 @@
 						<Button variant="outline" onclick={() => navigate('/settings')}>
 							<SettingsIcon size={16} />
 						</Button>
-						<Button variant="outline" onclick={() => w.lock()}>
-							Lock
+						<Button variant="outline" onclick={() => { w.logout(); navigate('/') }}>
+							Logout
 						</Button>
 					</div>
 				</CardContent>
@@ -417,4 +387,3 @@
 			</Card>
 		</div>
 	{/if}
-{/if}
diff --git a/apps/desktop/src/lib/states/wallet.svelte.ts b/apps/desktop/src/lib/states/wallet.svelte.ts
index e021025..1b71763 100644
--- a/apps/desktop/src/lib/states/wallet.svelte.ts
+++ b/apps/desktop/src/lib/states/wallet.svelte.ts
@@ -132,9 +132,6 @@ export const Wallet = () => {
 	const login = async (type: AccountType) => {
 		accountType = type
 		if (type === 'multi') {
-			if (!seed && vaultExists) {
-				await loadSeed()
-			}
 			if (seed) await switchNetwork(network)
 		} else if (type === 'monero') {
 			if (moneroInstalled && !moneroRunning) {
diff --git a/apps/desktop/src/routes/index.svelte b/apps/desktop/src/routes/index.svelte
index a2bae17..caf2569 100644
--- a/apps/desktop/src/routes/index.svelte
+++ b/apps/desktop/src/routes/index.svelte
@@ -33,12 +33,12 @@
 			<CardContent>
 				<div class="flex flex-col gap-3">
 					<Button
-						onclick={() => navigate('/multicoin')}
+						onclick={async () => { await w.login('multi'); navigate('/multicoin') }}
 						class="w-full">
 						Multi Coins (ETH / BSC / Polygon)
 					</Button>
 					<Button
-						onclick={() => navigate('/monero')}
+						onclick={async () => { await w.login('monero'); navigate('/monero') }}
 						variant="outline"
 						class="w-full">
 						Monero
diff --git a/apps/desktop/src/routes/monero/index.svelte b/apps/desktop/src/routes/monero/index.svelte
index db0bbfe..073ce6f 100644
--- a/apps/desktop/src/routes/monero/index.svelte
+++ b/apps/desktop/src/routes/monero/index.svelte
@@ -48,7 +48,7 @@
 				<CardContent>
 					<div class="flex flex-col gap-3">
 						<Button
-							onclick={() => navigate('/multicoin')}
+							onclick={async () => { await w.login('multi'); navigate('/multicoin') }}
 							variant="outline"
 							class="w-full">
 							Multi Coins (ETH / BSC / Polygon)
@@ -67,11 +67,6 @@
 					class="cursor-pointer rounded-md px-2.5 py-1 text-xs font-medium transition-colors bg-primary text-primary-foreground">
 					Monero
 				</button>
-				<button
-					class="cursor-pointer rounded-md px-2.5 py-1 text-xs font-medium transition-colors bg-muted text-muted-foreground hover:bg-muted/80"
-					onclick={() => w.logout()}>
-					Logout
-				</button>
 			</div>
 
 			{#if w.moneroDownloading}
@@ -214,6 +209,9 @@
 						<Button variant="outline" onclick={() => w.moneroStop()}>
 							Stop
 						</Button>
+						<Button variant="outline" onclick={() => { w.logout(); navigate('/') }}>
+							Logout
+						</Button>
 					</div>
 				</CardContent>
 			</Card>