diff --git a/webapp/graphql/Fragments.js b/webapp/graphql/Fragments.js
index 495f15094..6da4dec9a 100644
--- a/webapp/graphql/Fragments.js
+++ b/webapp/graphql/Fragments.js
@@ -1,5 +1,15 @@
 import gql from 'graphql-tag'
 
+export const linkableUserFragment = lang => gql`
+  fragment user on User {
+    id
+    slug
+    name
+    avatar
+    disabled
+    deleted
+  }
+`
 export const userFragment = lang => gql`
   fragment user on User {
     id
@@ -32,8 +42,6 @@ export const postCountsFragment = gql`
   }
 `
 export const postFragment = lang => gql`
-  ${userFragment(lang)}
-
   fragment post on Post {
     id
     title
@@ -68,8 +76,6 @@ export const postFragment = lang => gql`
   }
 `
 export const commentFragment = lang => gql`
-  ${userFragment(lang)}
-
   fragment comment on Comment {
     id
     createdAt
diff --git a/webapp/graphql/PostQuery.js b/webapp/graphql/PostQuery.js
index 3de1178b0..b6b4c2b6f 100644
--- a/webapp/graphql/PostQuery.js
+++ b/webapp/graphql/PostQuery.js
@@ -1,9 +1,10 @@
 import gql from 'graphql-tag'
-import { postFragment, commentFragment, postCountsFragment } from './Fragments'
+import { userFragment, postFragment, commentFragment, postCountsFragment } from './Fragments'
 
 export default i18n => {
   const lang = i18n.locale().toUpperCase()
   return gql`
+    ${userFragment(lang)}
     ${postFragment(lang)}
     ${postCountsFragment}
     ${commentFragment(lang)}
@@ -23,6 +24,7 @@ export default i18n => {
 export const filterPosts = i18n => {
   const lang = i18n.locale().toUpperCase()
   return gql`
+    ${userFragment(lang)}
     ${postFragment(lang)}
     ${postCountsFragment}
 
@@ -38,6 +40,7 @@ export const filterPosts = i18n => {
 export const profilePagePosts = i18n => {
   const lang = i18n.locale().toUpperCase()
   return gql`
+    ${userFragment(lang)}
     ${postFragment(lang)}
     ${postCountsFragment}
 
@@ -66,6 +69,7 @@ export const PostsEmotionsByCurrentUser = () => {
 export const relatedContributions = i18n => {
   const lang = i18n.locale().toUpperCase()
   return gql`
+    ${userFragment(lang)}
     ${postFragment(lang)}
     ${postCountsFragment}
 
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 4ed252261..b5281b641 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -1,5 +1,5 @@
 import gql from 'graphql-tag'
-import { userFragment, postFragment, commentFragment } from './Fragments'
+import { linkableUserFragment, userFragment, postFragment, commentFragment } from './Fragments'
 
 export default i18n => {
   const lang = i18n.locale().toUpperCase()
@@ -49,6 +49,7 @@ export const minimisedUserQuery = () => {
 export const notificationQuery = i18n => {
   const lang = i18n.locale().toUpperCase()
   return gql`
+    ${linkableUserFragment()}
     ${commentFragment(lang)}
     ${postFragment(lang)}
 
@@ -78,6 +79,7 @@ export const notificationQuery = i18n => {
 export const markAsReadMutation = i18n => {
   const lang = i18n.locale().toUpperCase()
   return gql`
+    ${linkableUserFragment()}
     ${commentFragment(lang)}
     ${postFragment(lang)}