diff --git a/client/coral-admin/src/containers/Header.js b/client/coral-admin/src/containers/Header.js
index e2c3692c4..11236ac60 100644
--- a/client/coral-admin/src/containers/Header.js
+++ b/client/coral-admin/src/containers/Header.js
@@ -14,7 +14,11 @@ export default withQuery(gql`
     })
     flaggedUsernamesCount: userCount(query: {
       action_type: FLAG,
-      statuses: [SET, CHANGED]
+      state: {
+        status: {
+          username: [SET, CHANGED]
+        }
+      }
     })
   }
 `, {
diff --git a/client/coral-admin/src/containers/SuspendUserDialog.js b/client/coral-admin/src/containers/SuspendUserDialog.js
index 3d5283df9..5c554e70c 100644
--- a/client/coral-admin/src/containers/SuspendUserDialog.js
+++ b/client/coral-admin/src/containers/SuspendUserDialog.js
@@ -48,7 +48,7 @@ class SuspendUserDialogContainer extends Component {
 SuspendUserDialogContainer.propTypes = {
   open: PropTypes.bool,
   hideSuspendUserDialog: PropTypes.func,
-  username: PropTypes.object,
+  username: PropTypes.string,
 };
 
 const withOrganizationName = withQuery(gql`
diff --git a/client/coral-admin/src/routes/Community/components/FlaggedUser.js b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
index b2156f479..9f490d078 100644
--- a/client/coral-admin/src/routes/Community/components/FlaggedUser.js
+++ b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
@@ -55,15 +55,16 @@ class User extends React.Component {
                 className={styles.button}>
                 {user.username}
               </button>
+              {console.log(user.status.banned.status, user)}
               {me.id !== user.id &&
                 <ActionsMenu icon="not_interested">
                   <ActionsMenuItem
-                    disabled={user.status === 'BANNED'}
+                    disabled={user.status.banned.status === 'BANNED'}
                     onClick={this.showSuspenUserDialog}>
                     Suspend User
                   </ActionsMenuItem>
                   <ActionsMenuItem
-                    disabled={user.status === 'BANNED'}
+                    disabled={user.status.banned.status === 'BANNED'}
                     onClick={this.showBanUserDialog}>
                     Ban User
                   </ActionsMenuItem>
diff --git a/client/coral-admin/src/routes/Community/containers/Community.js b/client/coral-admin/src/routes/Community/containers/Community.js
index 6cb5e700d..282b1e6b1 100644
--- a/client/coral-admin/src/routes/Community/containers/Community.js
+++ b/client/coral-admin/src/routes/Community/containers/Community.js
@@ -20,10 +20,16 @@ const mapDispatchToProps = (dispatch) =>
 
 const withData = withQuery(gql`
   query TalkAdmin_Community {
-    flaggedUsernamesCount: userCount(query: {
-      action_type: FLAG,
-      statuses: [SET, CHANGED]
-    })
+    flaggedUsernamesCount: userCount(
+      query:{
+        action_type: FLAG,
+        state: {
+          status: {
+            username: [SET, CHANGED]
+          }
+        }
+      }
+    )
     ...${getDefinitionName(FlaggedAccounts.fragments.root)}
     ...${getDefinitionName(FlaggedUser.fragments.root)}
     me {
diff --git a/client/coral-admin/src/routes/Community/containers/FlaggedAccounts.js b/client/coral-admin/src/routes/Community/containers/FlaggedAccounts.js
index b7f918d8c..7418373e9 100644
--- a/client/coral-admin/src/routes/Community/containers/FlaggedAccounts.js
+++ b/client/coral-admin/src/routes/Community/containers/FlaggedAccounts.js
@@ -90,7 +90,16 @@ FlaggedAccountsContainer.propTypes = {
 
 const LOAD_MORE_QUERY = gql`
   query TalkAdmin_LoadMoreFlaggedAccounts($limit: Int, $cursor: Cursor) {
-    users(query:{action_type: FLAG, statuses: [PENDING], limit: $limit, cursor: $cursor}){
+    users(query:{
+        action_type: FLAG,
+        state: {
+          status: {
+            username: [PENDING]
+          }
+        },
+        limit: $limit,
+        cursor: $cursor
+      }){
       hasNextPage
       endCursor
       nodes {
@@ -116,7 +125,15 @@ export default compose(
   withFragments({
     root: gql`
       fragment TalkAdminCommunity_FlaggedAccounts_root on RootQuery {
-        users(query:{action_type: FLAG, statuses: [PENDING], limit: 10}){
+        users(query:{
+            action_type: FLAG,
+            state: {
+              status: {
+                username: [PENDING]
+              }
+            }
+            limit: 10
+          }){
           hasNextPage
           endCursor
           nodes {
diff --git a/client/coral-admin/src/routes/Moderation/containers/Comment.js b/client/coral-admin/src/routes/Moderation/containers/Comment.js
index 9748359ae..9f7bfc959 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Comment.js
@@ -37,7 +37,19 @@ export default withFragments({
       user {
         id
         username
-        status
+        state {
+          status {
+            username {
+              status
+            }
+            banned {
+              status
+            }
+            suspension {
+              until
+            }
+          }
+        }
       }
       asset {
         id