diff --git a/http-client/src/components/accounts.rs b/http-client/src/components/accounts.rs
index c484b93..b550737 100644
--- a/http-client/src/components/accounts.rs
+++ b/http-client/src/components/accounts.rs
@@ -40,9 +40,13 @@ impl Component for Accounts {
     fn view(&self, ctx: &Context<Self>) -> Html {
         html! {
             <>
-             <ul class={classes!("accounts")}>
-                    { for ctx.props().account_nrs.iter().map(|e| self.account_entry(e, &ctx.props().selected_nr, ctx)) }
-             </ul>
+            if ctx.props().account_nrs.is_empty() {
+                <h2>{"No accounts"}</h2>
+            } else {
+                 <ul class={classes!("accounts")}>
+                        { for ctx.props().account_nrs.iter().map(|e| self.account_entry(e, &ctx.props().selected_nr, ctx)) }
+                 </ul>
+            }
             </>
         }
     }
diff --git a/http-client/src/components/main.rs b/http-client/src/components/main.rs
index 39cc525..6b73c3a 100644
--- a/http-client/src/components/main.rs
+++ b/http-client/src/components/main.rs
@@ -100,8 +100,10 @@ impl Component for Main {
                         {"welcome to your vaults"}
                     </h1>
                     <div class={classes!("inner-content")}>
-                        <Accounts  account_nrs={self.account_nrs.clone()} selected_nr={self.selected_nr.clone()} />
-                        <Account balance={self.selected_balance} owner={self.selected_owner.clone()} nr={self.selected_nr.clone()} account_nrs={self.account_nrs.clone()} />
+                        <Accounts account_nrs={self.account_nrs.clone()} selected_nr={self.selected_nr.clone()} />
+                        if !self.account_nrs.is_empty() {
+                            <Account balance={self.selected_balance} owner={self.selected_owner.clone()} nr={self.selected_nr.clone()} account_nrs={self.account_nrs.clone()} />
+                        }
                     </div>
                 </main>
             </>