diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index 39e8d5e2..c5652343 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -13,7 +13,7 @@
         Emails sent to an <b>alias</b> will be forwarded to your personal email. <br><br>
         Please note that email alias is <b>NOT</b> temporary, meaning an alias works forever! <br><br>
         Email alias is a great way to hide your personal email so feel free to
-        use it whenever possible, for ex on untrusted websites.">
+        use it whenever possible, for ex on untrusted websites 😎">
       Email Alias
     </h3>
     <form method="post" class="col text-right">
@@ -79,7 +79,7 @@
                             {% if loop.index ==1 %}
                                 data-intro="By triggering the test email, 
                             SimpleLogin server will send an email to this alias
-                            and this email should arrive to your personal email inbox."
+                            and this email should arrive to your personal email inbox 🚀"
                             {% endif %}
                         >Trigger Test Email
                         </button>
@@ -129,78 +129,80 @@
     </div>
   </div>
 
-  <div class="page-header row">
-    <h3 class="page-title col" data-intro="Here you can find the list of website/app on which
+  {% if  client_users %}
+    <div class="page-header row">
+      <h3 class="page-title col" data-intro="Here you can find the list of website/app on which
     you have used the <b>Connect with SimpleLogin</b> button <br><br>
     You also see what information that SimpleLogin has communicated to these website/app when you sign in.
 ">
-      Apps
-    </h3>
-  </div>
+        Apps
+      </h3>
+    </div>
 
-  <div class="row row-cards row-deck mt-4">
-    <div class="col-12">
-      <div class="card">
-        <div class="table-responsive">
-          <table class="table table-hover table-outline table-vcenter text-nowrap card-table">
-            <thead>
-            <tr>
-              <th>
-                App
-              </th>
-              <th>
-                Info
-                <i class="fe fe-help-circle" data-toggle="tooltip"
-                   title="Info sent to this app/website"></i>
-              </th>
-              <th class="text-center">
-                First used
-                <i class="fe fe-help-circle" data-toggle="tooltip"
-                   title="The first time you have used the SimpleLogin on this app/website"></i>
-              </th>
-              <!--<th class="text-center">Last used</th>-->
-            </tr>
-            </thead>
-            <tbody>
-            {% for client_user in client_users %}
+    <div class="row row-cards row-deck mt-4">
+      <div class="col-12">
+        <div class="card">
+          <div class="table-responsive">
+            <table class="table table-hover table-outline table-vcenter text-nowrap card-table">
+              <thead>
               <tr>
-                <td>
-                  {{ client_user.client.name }}
-                </td>
-
-                <td>
-                  {% for scope, val in client_user.get_user_info().items() %}
-                    <div>
-                      {% if scope == "email" %}
-                        Email: <a href="mailto:{{ val }}">{{ val }}</a>
-                      {% elif scope == "name" %}
-                        Name: {{ val }}
-                      {% endif %}
-                    </div>
-                  {% endfor %}
-                </td>
-
-
-                <td class="text-center">
-                  {{ client_user.created_at | dt }}
-                </td>
-
-                {#            TODO: add last_used#}
-                <!--
-                  <td class="text-center">
-                    <div>4 minutes ago</div>
-                  </td>
-                -->
-
+                <th>
+                  App
+                </th>
+                <th>
+                  Info
+                  <i class="fe fe-help-circle" data-toggle="tooltip"
+                     title="Info sent to this app/website"></i>
+                </th>
+                <th class="text-center">
+                  First used
+                  <i class="fe fe-help-circle" data-toggle="tooltip"
+                     title="The first time you have used the SimpleLogin on this app/website"></i>
+                </th>
+                <!--<th class="text-center">Last used</th>-->
               </tr>
-            {% endfor %}
+              </thead>
+              <tbody>
+              {% for client_user in client_users %}
+                <tr>
+                  <td>
+                    {{ client_user.client.name }}
+                  </td>
 
-            </tbody>
-          </table>
+                  <td>
+                    {% for scope, val in client_user.get_user_info().items() %}
+                      <div>
+                        {% if scope == "email" %}
+                          Email: <a href="mailto:{{ val }}">{{ val }}</a>
+                        {% elif scope == "name" %}
+                          Name: {{ val }}
+                        {% endif %}
+                      </div>
+                    {% endfor %}
+                  </td>
+
+
+                  <td class="text-center">
+                    {{ client_user.created_at | dt }}
+                  </td>
+
+                  {#            TODO: add last_used#}
+                  <!--
+                    <td class="text-center">
+                      <div>4 minutes ago</div>
+                    </td>
+                  -->
+
+                </tr>
+              {% endfor %}
+
+              </tbody>
+            </table>
+          </div>
         </div>
       </div>
     </div>
-  </div>
+  {% endif %}
 {% endblock %}
 
 {% block script %}