diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index 794da581a..60f939477 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -33,12 +33,16 @@ const createAction = async ({user = {}, pubsub, loaders: {Comments}}, {item_id,
 
   if (item_type === 'USERS' && action_type === 'FLAG') {
 
-    // Set the user as pending if it was a user flag.
-    await UsersService.setStatus(item_id, 'PENDING');
+    // Set the user as pending if it was a user flag and user has no Admin, Staff or Moderation roles
+    let user = await UsersService.findById(item_id);
+    if(!user.roles)
+      await UsersService.setStatus(item_id, 'PENDING');
   }
 
   if (comment) {
-    pubsub.publish('commentFlagged', comment);
+    let user = await UsersService.findById(comment.author_id);
+    if(!user.roles)
+      pubsub.publish('commentFlagged', comment);
   }
 
   return action;