1 files changed, 17 insertions, 7 deletions
diff --git a/packages/demobank-ui/src/pages/BankFrame.tsx b/packages/demobank-ui/src/pages/BankFrame.tsx
index a106f370d..35cb30065 100644
--- a/packages/demobank-ui/src/pages/BankFrame.tsx
+++ b/packages/demobank-ui/src/pages/BankFrame.tsx
@@ -86,9 +86,9 @@ export function BankFrame({
             backend.state.status !== "loggedIn"
               ? undefined
               : () => {
-                  backend.logOut();
-                  resetBankState();
-                }
+                backend.logOut();
+                resetBankState();
+              }
           }
           sites={
             !settings.topNavSites ? [] : Object.entries(settings.topNavSites)
@@ -174,16 +174,26 @@ export function BankFrame({
   );
 }
 
-function WelcomeAccount({ account: accountName }: { account: string }): VNode {
+function WelcomeAccount({ account }: { account: string }): VNode {
   const { i18n } = useTranslationContext();
+  const result = useAccountDetails(account)
+  if (!result) {
+    return <Loading />;
+  }
+  if (result instanceof TalerError) {
+    return <div />;
+  }
+  if (result.type === "fail") {
+    return <a href={privatePages.myAccountDetails.url({})} class="underline underline-offset-2" >
+      <i18n.Translate>Welcome</i18n.Translate>
+    </a>;
+  }
   return (
     <a
       href={privatePages.myAccountDetails.url({})}
       class="underline underline-offset-2"
     >
-      <i18n.Translate>
-        Welcome, <span class="whitespace-nowrap">{accountName}</span>
-      </i18n.Translate>
+      <i18n.Translate>Welcome, <span class="whitespace-nowrap">{result.body.name}</span></i18n.Translate>
     </a>
   );
 }