diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 920d2c6c..5a402c20 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -562,7 +562,7 @@ class nagios_monitor {
    $nrpe_clients = hiera_array('nrpe_clients',[]);
    $allowed_hosts = join($nrpe_clients," ");
    $web_admin_pw   = safe_hiera('nagios_nagiosadmin_password');
-   $web_admin_user = 'icingaadmin';
+   $web_admin_user = 'nagiosadmin';
    
    class { 'webserver': }
    class { 'nagioscfg':
@@ -580,7 +580,7 @@ class nagios_monitor {
 
    file {
       '/root/MONITOR_WEB_PASSWORD':
-        content => sprintf("%s\n", $web_admin_pw),
+        content => sprintf("%s\n%s\n", $nagiosadmin, $web_admin_pw),
         group   => 'root',
         mode    => '0600',
         ;
diff --git a/nic.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc b/nic.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
index eb5d0ea8..1b6f9a6a 100644
--- a/nic.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
+++ b/nic.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
@@ -3,22 +3,22 @@ STATUS=UPDATED
 -----BEGIN PGP MESSAGE-----
 Version: GnuPG v2
 
-hQEMA7SKeDo1rx8mAQf+M1p1j9EfEeXoI4nsfjvpIWqYic3wk1bIwj5sWXJmkyUC
-vOvLiQkwWkIjBq67sTFk8LJmnbhemwlH3G2r02CcdNbb5wb6U0hjVvgOhTWBmJct
-732Lr5ydcsDGbLuLb3qbqsivNQ2tVlBdgA+eJOAWbScPC8Y3IkyxxjtcvvAtXJub
-/p2I7MiOOTYgMY3wA46PI3QmtTje9jvRxb2tYdeyQZU9iKIsS5diDYJRiAvPsumt
-vySsfqqzL4lqyrXE2+AB0fpDRxPpPjzU6r8hMVdGcB6cZFGl1K5kvtiCzCbPYyI8
-OGdbZHl4i/JDNgxT4eBiGM8AQVa/WC4yvT1FFrpJa9LBOAGSZvSPKBvPCNXXfQYh
-HTqm399Z9j/rR5QXjpOZiOa4webCS/GAF3ONFhAFxDk4+fRf0qEsXBP2AFVPUV08
-H72oy1Q3NdlwnXkyWxe9H6jDoPIMJp6Z8yzeFxP0G/HQEz6wlo4YHH3IXtZHKHPT
-h3TJrdGQVndOR8a8CTD9S9wSM5sbYFf/JG5Vmy740QkGs5DHHtBxYDxTz5jb3jBm
-gbWpauwobPVxIgVGD/WVJAkP2yTwE3bKxPqr4DpYrDn0+ijHtLIstyNTyItoyIPU
-LU5YJb2hDvhzQ6RhY4WJcM+K53Sgt/OEf+kjkzvopzZU19ylG5ttfb+jqqjhmaMl
-jomTwVu3BCpIs5L0QyT+3lADjaGID8AO5w4J2wVAbzyzRlzFEewQcjU7I+QuODHW
-FFqzBpKyGOYuEcbxXE6wg/LdHrfzlMjkskja+Xue0ChbszU0roinAgQlkwvHjSKN
-In0riYhj7vdik8nzw0+m5+RCjbknl68QsFPG1or96MxY7iPEzKRLTzGXYWPhBOKf
-r7l/mGvIROMcJrCLJn3xEVJoALOq3k4Qb7cmFgoN1Q6T5uIT1VgQHguSwE0W/GMd
-zPjtETKOdm1DDIWuLKQgjoUHSF5CzSOKp7HiLUNtMNaOqqN+8DUJdQCZth0PJRwU
-zFrbINW6Xybn4w==
-=3yoI
+hQEMA7SKeDo1rx8mAQf/Ve5L7syfLpVTf5xNt9B2E/f/I6DuWxkBeliq3GWptaIZ
+1jsviwWp6wrCsHS1rUy4/dCpemDFHAMHIjk8nyW/7IccfP90OssW+pgkwOnhdAJc
+jbUXwv3kxDUm1nxGewXFQNILdOVFZ02UFpLGJkNqKww3DGgKCQNbBWb4/fVJkl4D
+5cMcXGxPZIn8PSZm9Bre2nLD42KnWeTtBWEG+n2Pb9w+RdTSGOV3xKEd42Xd9hhL
+pzDrWxi+FuK1WxADr70U3B1v4eK6asH5Tbx824A1euWClLI0mkfTPB0ZgPI9fa7e
+Z1ibLE65ABGkWb7UVe85kCmJRxi9uGSU9zzaLx72h9LpAQE42sZ0xI54Hqyy7RZ2
+N+O9WtsInB6cH3/kzZt6U3Yg1YzwS5xLg9KQxm/xJAYONLvDc+Lr56g9bomzUUMl
+ATNsGGSce39AWsaBl3JCU3yX3KmZdflJ7EYDhM+pMusyw1YOR2yDVrmsHhXQ+lji
+xXDfMU6UZyNf6rIxbIHhfCH5Wfv70QGhu0H9sTHGIP43CcQumJf6b0bEAStY3qiL
+GfS17m1HMMDcRPzkupHsSdP9c8Fs4B+efruzhDTBStR8M2qTkUgtFH1eNHof9okh
+ZeTXZ9kqvAgNpB5SJuJTawFajSym//oLjDzyDCzXdR3KEvh7URAicbTG7n7t0gEc
+OVnNNSuxbGZyKQmuMW/kZJndbb/KI0/sGWGgBiz4uNUVgDWKkM3bRabmp4gv/Q7m
+ik4pvxfpQcjVTDJfBMWuukHKL2jPTRD2RuGh7RU3kt7F1lkJadYx8rmoVCWqGMIn
+W+Ms6+U9gdY+gw1jzisSfwsCvbcD3yKrK9AuLk5hgIOUsh7IXvp1ruX7Urb+EO1W
+VFuP4OfOhrUoKO8VBkIP06mPznDAe6kTCHRXXsqdJqSpCdqsLYzZDHUWy03/3AKO
+mpeGSXTViaoAxDX2o72jRSQBapVu6RfikMCyGMjupDqKS9d7EeIVxLucc7a1EyXk
+U6cy0Xf9KroXMZO5fVL518ceLwGBETwwRHmc0uQxtWrBCoHzm2hFV9L7DIqi/Rtw
+=uzeO
 -----END PGP MESSAGE-----