diff --git a/src/app/commands.ts b/src/app/commands.ts
index 7a168ab..f4f6177 100644
--- a/src/app/commands.ts
+++ b/src/app/commands.ts
@@ -161,6 +161,7 @@ export const logout = async () => {
   }
 
   await clearStorage()
+
   localStorage.clear()
 }
 
diff --git a/src/app/components/LogIn.svelte b/src/app/components/LogIn.svelte
index a2095ab..c40cf60 100644
--- a/src/app/components/LogIn.svelte
+++ b/src/app/components/LogIn.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import cx from "classnames"
   import {onMount} from "svelte"
   import {Capacitor} from "@capacitor/core"
   import {getNip07, getNip55, Nip55Signer} from "@welshman/signer"
@@ -73,15 +72,12 @@
 
   let signers: any[] = []
   let loading: string | undefined
-  let hasNativeSigner = Boolean(getNip07())
+
+  $: hasSigner = getNip07() || signers.length > 0
 
   onMount(async () => {
     if (Capacitor.isNativePlatform()) {
       signers = await getNip55()
-
-      if (signers.length > 0) {
-        hasNativeSigner = true
-      }
     }
   })
 </script>
@@ -93,21 +89,8 @@
     <Button class="link" on:click={() => pushModal(InfoNostr)}>nostr protocol</Button>, which allows
     you to own your social identity.
   </p>
-  {#if BURROW_URL}
-    <Button disabled={loading} on:click={loginWithPassword} class="btn btn-primary">
-      {#if loading === "password"}
-        <span class="loading loading-spinner mr-3" />
-      {:else}
-        <Icon icon="key" />
-      {/if}
-      Log in with Password
-    </Button>
-  {/if}
   {#if getNip07()}
-    <Button
-      disabled={loading}
-      on:click={loginWithNip07}
-      class={cx("btn", {"btn-primary": !BURROW_URL, "btn-neutral": BURROW_URL})}>
+    <Button disabled={loading} on:click={loginWithNip07} class="btn btn-primary">
       {#if loading === "nip07"}
         <span class="loading loading-spinner mr-3" />
       {:else}
@@ -117,10 +100,7 @@
     </Button>
   {/if}
   {#each signers as app}
-    <Button
-      disabled={loading}
-      class={cx("btn", {"btn-primary": !BURROW_URL, "btn-neutral": BURROW_URL})}
-      on:click={() => loginWithNip55(app)}>
+    <Button disabled={loading} class="btn btn-primary" on:click={() => loginWithNip55(app)}>
       {#if loading === "nip55"}
         <span class="loading loading-spinner mr-3" />
       {:else}
@@ -129,21 +109,43 @@
       Log in with {app.name}
     </Button>
   {/each}
+  {#if BURROW_URL && !hasSigner}
+    <Button disabled={loading} on:click={loginWithPassword} class="btn btn-primary">
+      {#if loading === "password"}
+        <span class="loading loading-spinner mr-3" />
+      {:else}
+        <Icon icon="key" />
+      {/if}
+      Log in with Password
+    </Button>
+  {/if}
   <Button
     disabled={loading}
     on:click={loginWithBunker}
-    class="btn {hasNativeSigner ? 'btn-neutral' : 'btn-primary'}">
+    class="btn {hasSigner || BURROW_URL ? 'btn-neutral' : 'btn-primary'}">
     <Icon icon="cpu" />
     Log in with Remote Signer
   </Button>
-  <Link
-    external
-    disabled={loading}
-    href="https://nostrapps.com#signers"
-    class="btn {hasNativeSigner ? '' : 'btn-neutral'}">
-    <Icon icon="compass" />
-    Browse Signer Apps
-  </Link>
+  {#if BURROW_URL && hasSigner}
+    <Button disabled={loading} on:click={loginWithPassword} class="btn">
+      {#if loading === "password"}
+        <span class="loading loading-spinner mr-3" />
+      {:else}
+        <Icon icon="key" />
+      {/if}
+      Log in with Password
+    </Button>
+  {/if}
+  {#if !hasSigner || !BURROW_URL}
+    <Link
+      external
+      disabled={loading}
+      href="https://nostrapps.com#signers"
+      class="btn {hasSigner || BURROW_URL ? '' : 'btn-neutral'}">
+      <Icon icon="compass" />
+      Browse Signer Apps
+    </Link>
+  {/if}
   <div class="text-sm">
     Need an account?
     <Button class="link" on:click={signUp}>Register instead</Button>