diff --git a/dashboard/src/style.css b/dashboard/src/style.css
index 673aabbeb..e08320d49 100644
--- a/dashboard/src/style.css
+++ b/dashboard/src/style.css
@@ -168,6 +168,10 @@ tr:hover .table-actions {
   font-size: 12px;
 }
 
+.text-muted {
+  opacity: 0.5;
+}
+
 .warning-label {
   margin-top: 6px;
   color: #8a6d3b;
diff --git a/dashboard/src/views/ActivationView.vue b/dashboard/src/views/ActivationView.vue
index 12a6ab022..bb72ec2bf 100644
--- a/dashboard/src/views/ActivationView.vue
+++ b/dashboard/src/views/ActivationView.vue
@@ -86,7 +86,6 @@ onMounted(async () => {
   <div class="container">
     <Transition name="slide-fade" mode="out-in">
       <div v-if="view === VIEWS.OWNER" class="view">
-        <!-- TODO translate -->
         <h1>Welcome to Cloudron</h1>
         <h3>Set up Admin Account</h3>
 
diff --git a/dashboard/src/views/UsersView.vue b/dashboard/src/views/UsersView.vue
index c7e212991..3ef7f2aee 100644
--- a/dashboard/src/views/UsersView.vue
+++ b/dashboard/src/views/UsersView.vue
@@ -239,7 +239,10 @@ onMounted(async () => {
           <i class="fa fa-ban" v-if="!user.active" v-tooltip="$t('users.users.inactiveTooltip')"></i>
         </template>
         <template #user="user">
-          {{ user.displayName }} &nbsp; <span class="text-muted">{{ user.username }}</span> &nbsp; <i v-show="user.source" class="far fa-address-book" v-tooltip="$t('users.users.externalLdapTooltip')"></i>
+          {{ user.displayName }}
+          <span class="text-muted" style="margin: 0 6px" v-if="user.username">{{ user.username }}</span>
+          <span class="text-muted" style="margin: 0 6px" v-else>{{ user.email }}</span>
+          <i v-show="user.source" class="far fa-address-book" v-tooltip="$t('users.users.externalLdapTooltip')"></i>
         </template>
         <template #groups="user">
           <span class="group-label" v-for="groupId in user.groupIds" :key="groupId">