diff --git a/manifests/main/config.pp b/manifests/main/config.pp
index 6184885..2bcee2a 100644
--- a/manifests/main/config.pp
+++ b/manifests/main/config.pp
@@ -6,12 +6,6 @@
 class confdroid_nagios::main::config (
 
 ) inherits confdroid_nagios::params {
-  if $ng_nagios_server == $fqdn {
-    include confdroid_nagios::server::service
-    include confdroid_nagios::client::target
-    }
-
-  if $ng_nagios_server != $fqdn {
-    include confdroid_nagios::client::target
-  }
+  include confdroid_nagios::server::service
+  include confdroid_nagios::client::target
 }
diff --git a/manifests/main/user.pp b/manifests/main/user.pp
index fc03208..25f6176 100644
--- a/manifests/main/user.pp
+++ b/manifests/main/user.pp
@@ -7,6 +7,7 @@ class confdroid_nagios::main::user (
 
 ) inherits confdroid_nagios::params {
   require confdroid_nagios::main::install
+
   if $ng_nagios_server == $fqdn {
     group { $ng_user:
       ensure    => present,