diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml
index 762746011c..6ff7c3d217 100644
--- a/roles/fedmsg/base/tasks/main.yml
+++ b/roles/fedmsg/base/tasks/main.yml
@@ -179,3 +179,19 @@
   when: semanageoutput.stdout.find("3000-3100") == -1
   tags:
   - fedmsg/base
+
+- name: Check if the nrpe user exists
+  shell: /usr/bin/getent passwd nrpe | /usr/bin/wc -l | tr -d ' '
+  register: nrpe_exists
+
+- name: Add nrpe user to the fedmsg group if it exists
+  user: name=nrpe groups=fedmsg append=yes
+  when: nrpe_exists.stdout == 1
+
+- name: Check if the collectd user exists
+  shell: /usr/bin/getent passwd collectd | /usr/bin/wc -l | tr -d ' '
+  register: collectd_exists
+
+- name: Add collectd user to the fedmsg group if it exists
+  user: name=collectd groups=fedmsg append=yes
+  when: collectd_exists.stdout == 1