diff --git a/client/coral-admin/src/routes/Moderation/components/BanUserDialog.js b/client/coral-admin/src/routes/Moderation/components/BanUserDialog.js
index bfca4ceb1..56507e13c 100644
--- a/client/coral-admin/src/routes/Moderation/components/BanUserDialog.js
+++ b/client/coral-admin/src/routes/Moderation/components/BanUserDialog.js
@@ -26,7 +26,7 @@ const BanUserDialog = ({open, handleClose, handleBanUser, rejectComment, user, c
         <h2>{t('bandialog.ban_user')}</h2>
       </div>
       <div className={styles.separator}>
-        <h3>{t('bandialog.are_you_sure', user.name)}</h3>
+        <h3>{t('bandialog.are_you_sure', user.username)}</h3>
         <i>{showRejectedNote && t('bandialog.note')}</i>
       </div>
       <div className={styles.buttons}>
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 18f3aa057..2a5f44f28 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -76,7 +76,7 @@ class Comment extends React.Component {
               {
                 !minimal && (
                   <span className={styles.username} onClick={() => viewUserDetail(comment.user.id)}>
-                    {comment.user.name}
+                    {comment.user.username}
                   </span>
                 )
               }
@@ -102,7 +102,7 @@ class Comment extends React.Component {
                 <ActionsMenu icon="not_interested">
                   <ActionsMenuItem
                     disabled={comment.user.status === 'BANNED'}
-                    onClick={() => props.showSuspendUserDialog(comment.user.id, comment.user.name, comment.id, comment.status)}>
+                    onClick={() => props.showSuspendUserDialog(comment.user.id, comment.user.username, comment.id, comment.status)}>
                     Suspend User</ActionsMenuItem>
                   <ActionsMenuItem
                     disabled={comment.user.status === 'BANNED'}
diff --git a/client/coral-admin/src/routes/Moderation/containers/Comment.js b/client/coral-admin/src/routes/Moderation/containers/Comment.js
index 26074065d..8843188b8 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Comment.js
@@ -26,7 +26,7 @@ export default withFragments({
       status
       user {
         id
-        name: username
+        username
         status
       }
       asset {
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index d693863e0..737afdac9 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -209,18 +209,10 @@ class ModerationContainer extends Component {
 const COMMENTS_EDITED_SUBSCRIPTION = gql`
   subscription CommentEdited($asset_id: ID){
     commentEdited(asset_id: $asset_id){
-      id
-      body
-      status
-      editing {
-        edited
-      }
-      user {
-        id
-        username
-      }
+      ...${getDefinitionName(Comment.fragments.comment)}
     }
   }
+  ${Comment.fragments.comment}
 `;
 
 const STATUS_CHANGED_SUBSCRIPTION = gql`