diff --git a/defaults/main.yml b/defaults/main.yml
index 80280f8..d8763c6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -139,9 +139,6 @@ cgi_config:
   navbar_search_for_addresses: 1
   navbar_search_for_aliases: 1
 
-nagios_user: nagios
-nagios_group: nagios
-auth_user_file: /etc/nagios/nagios.httpwd
 monitored_hosts:
   - host_name: localhost
     use: linux-server
@@ -204,4 +201,10 @@ vhosts:
     vhost_aliases: nagios.example.org
     ssl_certificate_file: "/etc/letsencrypt/live/nagios4.example.org/fullchain.pem"
     ssl_certificate_key_file: "/etc/letsencrypt/live/nagios4.example.org/privkey.pem"
-    #ssl_certificate_chain_file: "/usr/local/apache2/conf/ssl/ca_bundle.crt"
\ No newline at end of file
+    #ssl_certificate_chain_file: "/usr/local/apache2/conf/ssl/ca_bundle.crt"
+
+nagios_user: nagios
+nagios_group: nagios
+auth_user_file: /etc/nagios4/htpasswd.users
+nagios_admin_user: nagiosadmin
+nagios_admin_password: "{{ vault_nagios_admin_password }}"