diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 91d4acd2..4d2853a6 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -3,6 +3,16 @@
     <div v-if="user" class="user-profile panel panel-default">
       <user-card-content :user="user" :switcher="true" :selected="timeline.viewing"></user-card-content>
     </div>
+    <div v-else class="panel user-profile-placeholder">
+      <div class="panel-heading">
+        <div class="title">
+          {{ $t('settings.profile_tab') }}
+        </div>
+      </div>
+      <div class="panel-body">
+        <i class="icon-spin3 animate-spin"></i>
+      </div>
+    </div>
     <Timeline :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/>
   </div>
 </template>
@@ -21,4 +31,12 @@
     align-items: stretch;
   }
 }
+.user-profile-placeholder {
+  .panel-body {
+    display: flex;
+    justify-content: center;
+    align-items: middle;
+    padding: 7em;
+  }
+}
 </style>
diff --git a/src/modules/users.js b/src/modules/users.js
index d2ac95cd..25d1c81f 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -17,6 +17,9 @@ export const mergeOrAdd = (arr, obj, item) => {
     // This is a new item, prepare it
     arr.push(item)
     obj[item.id] = item
+    if (item.screen_name && !item.screen_name.includes('@')) {
+      obj[item.screen_name] = item
+    }
     return { item, new: true }
   }
 }
@@ -87,7 +90,7 @@ const users = {
   actions: {
     fetchUser (store, id) {
       store.rootState.api.backendInteractor.fetchUser({ id })
-        .then((user) => store.commit('addNewUsers', user))
+        .then((user) => store.commit('addNewUsers', [user]))
     },
     registerPushNotifications (store) {
       const token = store.state.currentUser.credentials