diff --git a/src/app/base.ts b/src/app/base.ts
index 065b009..289f1a0 100644
--- a/src/app/base.ts
+++ b/src/app/base.ts
@@ -58,7 +58,7 @@ Object.assign(NetworkContext, {
   onEvent: (url: string, event: TrustedEvent) => tracker.track(event.id, url),
   isDeleted: (url: string, event: TrustedEvent) => repository.isDeleted(event),
   onAuth: async (url: string, challenge: string) => {
-    if (seenChallenges.has(challenge)) {
+    if (seenChallenges.has(challenge) || !signer.get()) {
       return
     }
 
diff --git a/src/app/components/LogIn.svelte b/src/app/components/LogIn.svelte
index e0c9900..f7faf11 100644
--- a/src/app/components/LogIn.svelte
+++ b/src/app/components/LogIn.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
-  import {makeSecret, Nip46Broker} from "@welshman/signer"
+  import {first} from '@welshman/lib'
+  import {makeSecret, getNip07, Nip46Broker} from "@welshman/signer"
   import Icon from "@lib/components/Icon.svelte"
   import Field from "@lib/components/Field.svelte"
   import Button from "@lib/components/Button.svelte"
   import Spinner from "@lib/components/Spinner.svelte"
   import SignUp from "@app/components/SignUp.svelte"
   import InfoNostr from "@app/components/LogIn.svelte"
+  import type {Session} from "@app/types"
   import {pushModal, clearModal} from "@app/modal"
   import {pushToast} from "@app/toast"
   import {addSession, nip46Perms} from "@app/base"
@@ -14,7 +16,26 @@
 
   const signUp = () => pushModal(SignUp)
 
-  const tryLogin = async () => {
+  const withLoading = (cb: () => void) => async () => {
+    loading = true
+
+    try {
+      await cb()
+    } finally {
+      loading = false
+    }
+  }
+
+  const onSuccess = async (session: Session) => {
+    addSession(session)
+
+    await loadUserData(session.pubkey)
+
+    pushToast({message: "Successfully logged in!"})
+    clearModal()
+  }
+
+  const loginWithNip46 = withLoading(async () => {
     const secret = makeSecret()
     const handle = await loadHandle(`${username}@${handler.domain}`)
 
@@ -28,29 +49,28 @@
     const {pubkey, relays = []} = handle
     const broker = Nip46Broker.get(pubkey, secret, handler)
 
-    loadUserData(pubkey, relays)
-
     if (await broker.connect("", nip46Perms)) {
-      addSession({method: "nip46", pubkey, secret, handler})
-      pushToast({message: "Successfully logged in!"})
-      clearModal()
+      await onSuccess({method: "nip46", pubkey, secret, handler})
     } else {
       pushToast({
         theme: "error",
         message: "Something went wrong! Please try again.",
       })
     }
-  }
+  })
 
-  const login = async () => {
-    loading = true
+  const loginWithNip07 = withLoading(async () => {
+    const pubkey = await getNip07()?.getPublicKey()
 
-    try {
-      await tryLogin()
-    } finally {
-      loading = false
+    if (pubkey) {
+      await onSuccess({method: "extension", pubkey})
+    } else {
+      pushToast({
+        theme: "error",
+        message: "Something went wrong! Please try again.",
+      })
     }
-  }
+  })
 
   const handler = {
     domain: "nsec.app",
@@ -62,7 +82,7 @@
   let loading = false
 </script>
 
-<form class="column gap-4" on:submit|preventDefault={login}>
+<form class="column gap-4" on:submit|preventDefault={loginWithNip46}>
   <h1 class="heading">Log in with Nostr</h1>
   <p class="m-auto max-w-sm text-center">
     Flotilla is built using the
@@ -73,13 +93,22 @@
     <div class="flex items-center gap-2" slot="input">
       <label class="input input-bordered flex w-full items-center gap-2">
         <Icon icon="user-rounded" />
-        <input bind:value={username} class="grow" type="text" placeholder="username" />
+        <input bind:value={username} disabled={loading} class="grow" type="text" placeholder="username" />
+        <span>@{handler.domain}</span>
       </label>
-      @{handler.domain}
+      {#if getNip07()}
+        <Button
+          disabled={loading}
+          on:click={loginWithNip07}
+          class="btn btn-neutral tooltip tooltip-left"
+          data-tip="Log in with browser extension">
+          <Icon icon="square-share-line" />
+        </Button>
+      {/if}
     </div>
   </Field>
   <div class="flex flex-col gap-2">
-    <Button type="submit" class="btn btn-primary" disabled={!username || loading}>
+    <Button type="submit" class="btn btn-primary flex-grow" disabled={!username || loading}>
       <Spinner {loading}>Log In</Spinner>
       <Icon icon="alt-arrow-right" />
     </Button>
diff --git a/src/app/state.ts b/src/app/state.ts
index c5b5140..a96b615 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -364,12 +364,15 @@ export const {
   name: "profiles",
   store: profiles,
   getKey: profile => profile.event.pubkey,
-  load: (pubkey: string, relays = [], request: Partial<SubscribeRequest> = {}) =>
-    load({
+  load: async (pubkey: string, hints = [], request: Partial<SubscribeRequest> = {}) => {
+    const relays = getWriteRelayUrls(await loadRelaySelections(pubkey))
+
+    return load({
       ...request,
-      relays: [...relays, ...INDEXER_RELAYS],
+      relays: [...relays, ...hints, ...INDEXER_RELAYS],
       filters: [{kinds: [PROFILE], authors: [pubkey]}],
-    }),
+    })
+  },
 })
 
 export const searchProfiles = derived(profiles, $profiles =>
@@ -410,10 +413,10 @@ export const {
   name: "relaySelections",
   store: relaySelections,
   getKey: relaySelections => relaySelections.pubkey,
-  load: (pubkey: string, relays = [], request: Partial<SubscribeRequest> = {}) =>
+  load: (pubkey: string, hints = [], request: Partial<SubscribeRequest> = {}) =>
     load({
       ...request,
-      relays: [...relays, ...INDEXER_RELAYS],
+      relays: [...hints, ...INDEXER_RELAYS],
       filters: [{kinds: [RELAYS], authors: [pubkey]}],
     }),
 })
@@ -440,12 +443,15 @@ export const {
   name: "follows",
   store: follows,
   getKey: follows => follows.event.pubkey,
-  load: (pubkey: string, relays = [], request: Partial<SubscribeRequest> = {}) =>
-    load({
+  load: async (pubkey: string, hints = [], request: Partial<SubscribeRequest> = {}) => {
+    const relays = getWriteRelayUrls(await loadRelaySelections(pubkey, hints))
+
+    return load({
       ...request,
-      relays: [...relays, ...INDEXER_RELAYS],
+      relays: [...relays, ...hints, ...INDEXER_RELAYS],
       filters: [{kinds: [FOLLOWS], authors: [pubkey]}],
-    }),
+    })
+  },
 })
 
 // Mutes
@@ -470,12 +476,15 @@ export const {
   name: "mutes",
   store: mutes,
   getKey: mute => mute.event.pubkey,
-  load: (pubkey: string, relays = [], request: Partial<SubscribeRequest> = {}) =>
-    load({
+  load: async (pubkey: string, hints = [], request: Partial<SubscribeRequest> = {}) => {
+    const relays = getWriteRelayUrls(await loadRelaySelections(pubkey, hints))
+
+    return load({
       ...request,
-      relays: [...relays, ...INDEXER_RELAYS],
+      relays: [...relays, ...hints, ...INDEXER_RELAYS],
       filters: [{kinds: [MUTES], authors: [pubkey]}],
-    }),
+    })
+  },
 })
 
 // Groups
@@ -537,12 +546,12 @@ export const {
   name: "groups",
   store: groups,
   getKey: (group: PublishedGroup) => group.nom,
-  load: (nom: string, relays: string[] = [], request: Partial<SubscribeRequest> = {}) =>
+  load: (nom: string, hints: string[] = [], request: Partial<SubscribeRequest> = {}) =>
     Promise.all([
-      ...relays.map(loadRelay),
+      ...hints.map(loadRelay),
       load({
         ...request,
-        relays,
+        relays: hints,
         filters: [{kinds: [GROUP_META], "#d": [nom]}],
       }),
     ]),
@@ -638,12 +647,15 @@ export const {
   name: "groupMemberships",
   store: groupMemberships,
   getKey: groupMembership => groupMembership.event.pubkey,
-  load: (pubkey: string, relays = [], request: Partial<SubscribeRequest> = {}) =>
-    load({
+  load: async (pubkey: string, hints = [], request: Partial<SubscribeRequest> = {}) => {
+    const relays = getWriteRelayUrls(await loadRelaySelections(pubkey, hints))
+
+    return load({
       ...request,
-      relays: [...relays, ...INDEXER_RELAYS],
+      relays: [...hints, ...relays, ...INDEXER_RELAYS],
       filters: [{kinds: [GROUPS], authors: [pubkey]}],
-    }),
+    })
+  },
 })
 
 // Group Messages
diff --git a/src/assets/icons/Calendar Minimalistic.png b/src/assets/icons/Calendar Minimalistic.png
new file mode 100644
index 0000000..692c9af
Binary files /dev/null and b/src/assets/icons/Calendar Minimalistic.png differ
diff --git a/src/assets/icons/Key.svg b/src/assets/icons/Key.svg
new file mode 100644
index 0000000..15f13ef
--- /dev/null
+++ b/src/assets/icons/Key.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.6807 14.5869C19.1708 14.5869 22 11.7692 22 8.29344C22 4.81767 19.1708 2 15.6807 2C12.1907 2 9.3615 4.81767 9.3615 8.29344C9.3615 9.90338 10.0963 11.0743 10.0963 11.0743L2.45441 18.6849C2.1115 19.0264 1.63143 19.9143 2.45441 20.7339L3.33616 21.6121C3.67905 21.9048 4.54119 22.3146 5.2466 21.6121L6.27531 20.5876C7.30403 21.6121 8.4797 21.0267 8.92058 20.4412C9.65538 19.4167 8.77362 18.3922 8.77362 18.3922L9.06754 18.0995C10.4783 19.5045 11.7128 18.6849 12.1537 18.0995C12.8885 17.075 12.1537 16.0505 12.1537 16.0505C11.8598 15.465 11.272 15.465 12.0067 14.7333L12.8885 13.8551C13.5939 14.4405 15.0439 14.5869 15.6807 14.5869Z" stroke="#1C274C" stroke-width="1.5" stroke-linejoin="round"/>
+<path d="M17.8851 8.29353C17.8851 9.50601 16.8982 10.4889 15.6807 10.4889C14.4633 10.4889 13.4763 9.50601 13.4763 8.29353C13.4763 7.08105 14.4633 6.09814 15.6807 6.09814C16.8982 6.09814 17.8851 7.08105 17.8851 8.29353Z" stroke="#1C274C" stroke-width="1.5"/>
+</svg>
diff --git a/src/lib/components/Icon.svelte b/src/lib/components/Icon.svelte
index 700b418..d299d3e 100644
--- a/src/lib/components/Icon.svelte
+++ b/src/lib/components/Icon.svelte
@@ -30,6 +30,7 @@
   import HandPills from "@assets/icons/Hand Pills.svg?dataurl"
   import HomeSmile from "@assets/icons/Home Smile.svg?dataurl"
   import InfoCircle from "@assets/icons/Info Circle.svg?dataurl"
+  import Key from "@assets/icons/Key.svg?dataurl"
   import LinkRound from "@assets/icons/Link Round.svg?dataurl"
   import Login from "@assets/icons/Login.svg?dataurl"
   import Login2 from "@assets/icons/Login 2.svg?dataurl"
@@ -80,6 +81,7 @@
     "hand-pills": HandPills,
     "home-smile": HomeSmile,
     "info-circle": InfoCircle,
+    key: Key,
     "link-round": LinkRound,
     login: Login,
     "login-2": Login2,
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 195d516..833a2e6 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -31,7 +31,9 @@
         goto("/home")
       }
     }
+  }
 
+  $: {
     if (modal) {
       dialog?.showModal()
       prev = modal