diff --git a/apps/web/src/components/AddressAutocomplete/KnownAccountsAutocomplete.tsx b/apps/web/src/components/AddressAutocomplete/KnownAccountsAutocomplete.tsx
index e8dab56f74..8848b1ca26 100644
--- a/apps/web/src/components/AddressAutocomplete/KnownAccountsAutocomplete.tsx
+++ b/apps/web/src/components/AddressAutocomplete/KnownAccountsAutocomplete.tsx
@@ -1,4 +1,4 @@
-import { useAllAccounts, useContactsForSelectedNetwork } from "@umami/state";
+import { useContactsForSelectedNetwork, useImplicitAccounts } from "@umami/state";
 import { type FieldValues, type Path } from "react-hook-form";
 
 import { AddressAutocomplete } from "./AddressAutocomplete";
@@ -9,7 +9,7 @@ export const KnownAccountsAutocomplete = <T extends FieldValues, U extends Path<
 ) => {
   const contacts = useContactsForSelectedNetwork();
 
-  const accounts = useAllAccounts().map(account => ({
+  const accounts = useImplicitAccounts().map(account => ({
     name: account.label,
     pkh: account.address.pkh,
   }));
diff --git a/apps/web/src/components/Header/Header.tsx b/apps/web/src/components/Header/Header.tsx
index dc61e205fd..9642378041 100644
--- a/apps/web/src/components/Header/Header.tsx
+++ b/apps/web/src/components/Header/Header.tsx
@@ -60,7 +60,7 @@ export const Header = () => {
       }}
     >
       {mode(<Icon as={LogoLightIcon} {...size} />, <Icon as={LogoDarkIcon} {...size} />)(colorMode)}
-      <SlideFade in={isVisible} offsetY="20px">
+      <SlideFade in={isVisible} offsetY="20px" unmountOnExit>
         <AccountTile
           background={color("100")}
           account={currentAccount}