diff --git a/manifests/main/user.pp b/manifests/main/user.pp
index 54505b4..00a26e7 100644
--- a/manifests/main/user.pp
+++ b/manifests/main/user.pp
@@ -24,30 +24,26 @@ class cd_nagios::main::user (
 
 ) inherits cd_nagios::params {
 
-  if $::fqdn == $ng_nagios_server {
+  require cd_nagios::main::install
 
-    require cd_nagios::main::install
+  group { $ng_user:
+    ensure          =>  present,
+    name            =>  $ng_user,
+    gid             =>  $ng_u_uid,
+    allowdupe       =>  false,
   }
 
-    group { $ng_user:
-      ensure          =>  present,
-      name            =>  $ng_user,
-      gid             =>  $ng_u_uid,
-      allowdupe       =>  false,
-    }
-
-    user {  $ng_user:
-      ensure          =>  present,
-      name            =>  $ng_user,
-      allowdupe       =>  false,
-      comment         =>  $ng_u_comment,
-      uid             =>  $ng_u_uid,
-      gid             =>  $ng_user,
-      groups          =>  $ng_u_groups,
-      managehome      =>  true,
-      home            =>  $ng_user_home,
-      shell           =>  $ng_user_shell,
-      require         =>  Group[$ng_user],
-    }
+  user {  $ng_user:
+    ensure          =>  present,
+    name            =>  $ng_user,
+    allowdupe       =>  false,
+    comment         =>  $ng_u_comment,
+    uid             =>  $ng_u_uid,
+    gid             =>  $ng_user,
+    groups          =>  $ng_u_groups,
+    managehome      =>  true,
+    home            =>  $ng_user_home,
+    shell           =>  $ng_user_shell,
+    require         =>  Group[$ng_user],
   }
 }