diff --git a/templates/nrpe_cfg.erb b/templates/nrpe_cfg.erb
index 1532e9a..800642d 100644
--- a/templates/nrpe_cfg.erb
+++ b/templates/nrpe_cfg.erb
@@ -18,37 +18,11 @@ pid_file=<%= @ne_nrpe_pid_file %>
 server_port=<%= @ne_nrpe_port %>
 
 
-# SERVER ADDRESS
-# Address that nrpe should bind to in case there are more than one interface
-# and you do not want nrpe to bind on all interfaces.
-# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
+server_address=<%= @ne_server_address %>
+listen_queue_size=<%= @ne_listen_queue_size %>
 
-#server_address=127.0.0.1
-
-
-# LISTEN QUEUE SIZE
-# Listen queue size (backlog) for serving incoming connections.
-# You may want to increase this value under high load.
-
-#listen_queue_size=5
-
-
-# NRPE USER
-# This determines the effective user that the NRPE daemon should run as.
-# You can either supply a username or a UID.
-#
-# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
-
-nrpe_user=nrpe
-
-
-# NRPE GROUP
-# This determines the effective group that the NRPE daemon should run as.
-# You can either supply a group name or a GID.
-#
-# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
-
-nrpe_group=nrpe
+nrpe_user=<%= @ne_user %>
+nrpe_group=<%= @ne_user %>
 
 
 # ALLOWED HOST ADDRESSES
@@ -271,11 +245,7 @@ command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w 150 -c 200
 #####################################
 
 
-#server_address=<%= @ne_server_address %>
-#listen_queue_size=<%= @ne_listen_queue_size %>
 
-#nrpe_user=<%= @ne_user %>
-#nrpe_group=<%= @ne_user %>
 
 #allowed_hosts=127.0.0.1,::1,<%= @ne_nagios_server %>
 #dont_blame_nrpe=<%= @ne_dont_blame_nrpe %>