diff --git a/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2 b/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2
index 424626dfdd..84ed4d51d5 100644
--- a/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2
+++ b/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2
@@ -143,7 +143,7 @@ authorized_for_configuration_information=*
 # authenticated to the web server.
 
 #authorized_for_system_commands=nagiosadmin
-authorized_for_system_commands=averi,kevin,nb,pfrields,puiterwijk,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson,mobrien,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch
+authorized_for_system_commands=kevin,nb,tibbs,pbrobinson,pingou,mizdebsk,msimacek,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch,gwmngilfen,james
 
 
 
@@ -173,9 +173,9 @@ authorized_for_all_hosts=*
 
 #authorized_for_all_service_commands=nagiosadmin
 #authorized_for_all_host_commands=nagiosadmin
-authorized_for_all_service_commands=averi,kevin,nb,pfrields,puiterwijk,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson,cverna,clime,mobrien,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch,zlopez
+authorized_for_all_service_commands=kevin,nb,tibbs,pbrobinson,pingou,mizdebsk,msimacek,cverna,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch,zlopez,gwmngilfen,james
+authorized_for_all_host_commands=kevin,nb,tibbs,pbrobinson,pingou,mizdebsk,msimacek,cverna,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch,zlopez,gwmngilfen,james
 
-authorized_for_all_host_commands=averi,kevin,nb,pfrields,puiterwijk,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson,cverna,clime,mobrien,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch,zlopez
 
 # STATUSMAP BACKGROUND IMAGE
 # This option allows you to specify an image to be used as a