diff --git a/components/User.spec.js b/components/User.spec.js
index f99568265..9a2bb3a4a 100644
--- a/components/User.spec.js
+++ b/components/User.spec.js
@@ -73,6 +73,12 @@ describe('User.vue', () => {
         beforeEach(() => {
           propsData.user.disabled = true
         })
+
+        it('renders anonymous user', () => {
+          const wrapper = Wrapper()
+          expect(wrapper.text()).not.toMatch('Tilda Swinton')
+          expect(wrapper.text()).toMatch('Anonymus')
+        })
       })
     })
   })
diff --git a/components/User.vue b/components/User.vue
index 19075cf44..620dee069 100644
--- a/components/User.vue
+++ b/components/User.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!user">
+  <div v-if="!user || user.disabled">
     <div style="display: inline-block; float: left; margin-right: 4px;  height: 100%; vertical-align: middle;">
       <ds-avatar
         style="display: inline-block; vertical-align: middle;"