diff --git a/app/components/topbar-account-panel/template.hbs b/app/components/topbar-account-panel/template.hbs
index b65983a..080621a 100644
--- a/app/components/topbar-account-panel/template.hbs
+++ b/app/components/topbar-account-panel/template.hbs
@@ -1,10 +1,8 @@
 <section id="user-account">
-  {{#if kredits.hasAccounts }}
-    {{#if kredits.currentUser}}
-      {{kredits.currentUser.name}}
-      {{#if kredits.currentUserIsCore}}
-        <span class="core-flag">(core)</span>
-      {{/if}}
+  {{#if (and kredits.hasAccounts kredits.currentUser)}}
+    {{kredits.currentUser.name}}
+    {{#if kredits.currentUserIsCore}}
+      <span class="core-flag">(core)</span>
     {{/if}}
   {{else}}
     Anonymous