diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index 3b2170661..7547927eb 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -59,7 +59,7 @@
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
-import HcUser from '~/components/User'
+import HcUser from '~/components/User/User'
 import ContentMenu from '~/components/ContentMenu'
 import ContentViewer from '~/components/Editor/ContentViewer'
 import HcEditCommentForm from '~/components/EditCommentForm/EditCommentForm'
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 43f9f3d8c..c59fa5acd 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -79,7 +79,7 @@ import locales from '~/locales'
 import PostMutations from '~/graphql/PostMutations.js'
 import HcCategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
 import HcTeaserImage from '~/components/TeaserImage/TeaserImage'
-import HcUser from '~/components/User'
+import HcUser from '~/components/User/User'
 
 export default {
   components: {
diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index f25d5fb1d..43faa671a 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -69,7 +69,7 @@
 </template>
 
 <script>
-import HcUser from '~/components/User'
+import HcUser from '~/components/User/User'
 import ContentMenu from '~/components/ContentMenu'
 import HcCategory from '~/components/Category'
 import HcRibbon from '~/components/Ribbon'
diff --git a/webapp/components/User/spec.js b/webapp/components/User/User.spec.js
similarity index 75%
rename from webapp/components/User/spec.js
rename to webapp/components/User/User.spec.js
index 312615a5b..71babe641 100644
--- a/webapp/components/User/spec.js
+++ b/webapp/components/User/User.spec.js
@@ -1,5 +1,5 @@
 import { mount, createLocalVue, RouterLinkStub } from '@vue/test-utils'
-import User from './index'
+import User from './User.vue'
 import Vuex from 'vuex'
 import VTooltip from 'v-tooltip'
 import Filters from '~/plugins/vue-filters'
@@ -67,6 +67,30 @@ describe('User', () => {
         expect(wrapper.text()).toMatch('Tilda Swinton')
       })
 
+      describe('user is deleted', () => {
+        beforeEach(() => {
+          propsData.user.deleted = true
+        })
+
+        it('renders anonymous user', () => {
+          const wrapper = Wrapper()
+          expect(wrapper.text()).not.toMatch('Tilda Swinton')
+          expect(mocks.$t).toHaveBeenCalledWith('profile.userAnonym')
+        })
+
+        describe('even if the current user is a moderator', () => {
+          beforeEach(() => {
+            getters['auth/isModerator'] = () => true
+          })
+
+          it('renders anonymous user', () => {
+            const wrapper = Wrapper()
+            expect(wrapper.text()).not.toMatch('Tilda Swinton')
+            expect(mocks.$t).toHaveBeenCalledWith('profile.userAnonym')
+          })
+        })
+      })
+
       describe('user is disabled', () => {
         beforeEach(() => {
           propsData.user.disabled = true
diff --git a/webapp/components/User/index.vue b/webapp/components/User/User.vue
similarity index 96%
rename from webapp/components/User/index.vue
rename to webapp/components/User/User.vue
index 684220f38..b8efd6ebe 100644
--- a/webapp/components/User/index.vue
+++ b/webapp/components/User/User.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!user || ((user.disabled || user.deleted) && !isModerator)">
+  <div v-if="displayAnonymous">
     <div
       style="display: inline-block; float: left; margin-right: 4px;  height: 100%; vertical-align: middle;"
     >
@@ -125,6 +125,10 @@ export default {
     itsMe() {
       return this.user.slug === this.$store.getters['auth/user'].slug
     },
+    displayAnonymous() {
+      const { user, isModerator } = this
+      return !user || (user.deleted) || (user.disabled && !isModerator)
+    },
     userLink() {
       const { id, slug } = this.user
       if (!(id && slug)) return ''
diff --git a/webapp/components/notifications/Notification/Notification.vue b/webapp/components/notifications/Notification/Notification.vue
index d55cdf1b2..93ca42980 100644
--- a/webapp/components/notifications/Notification/Notification.vue
+++ b/webapp/components/notifications/Notification/Notification.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import HcUser from '~/components/User'
+import HcUser from '~/components/User/User'
 
 export default {
   name: 'Notification',
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 9edf895e4..5e4ce758e 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -79,7 +79,7 @@ import ContentViewer from '~/components/Editor/ContentViewer'
 import HcCategory from '~/components/Category'
 import HcTag from '~/components/Tag'
 import ContentMenu from '~/components/ContentMenu'
-import HcUser from '~/components/User'
+import HcUser from '~/components/User/User'
 import HcShoutButton from '~/components/ShoutButton.vue'
 import HcCommentForm from '~/components/CommentForm/CommentForm'
 import HcCommentList from '~/components/CommentList/CommentList'
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index edefe6be0..19b0340f3 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -258,7 +258,7 @@
 
 <script>
 import uniqBy from 'lodash/uniqBy'
-import User from '~/components/User'
+import User from '~/components/User/User'
 import HcPostCard from '~/components/PostCard'
 import HcFollowButton from '~/components/FollowButton.vue'
 import HcCountTo from '~/components/CountTo.vue'