diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 53988d45..920d2c6c 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -561,6 +561,9 @@ class nrpe {
 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';
+   
    class { 'webserver': }
    class { 'nagioscfg':
       hostgroups      => $::roles,
@@ -568,6 +571,21 @@ class nagios_monitor {
    }
    class {'nagioscfg::slack': domain => 'sunet.slack.com', token => safe_hiera('slack_token','') } ->
    class {'nagioscfg::passive': enable_notifications => '1', obsess_over_hosts => '0'}
+
+   sunet::misc::htpasswd_user { $web_admin_user :
+      filename => "/etc/nagios3/htpasswd.users",
+      password => $web_admin_pw,
+      group    => 'www-data',
+    }
+
+   file {
+      '/root/MONITOR_WEB_PASSWORD':
+        content => sprintf("%s\n", $web_admin_pw),
+        group   => 'root',
+        mode    => '0600',
+        ;
+   }
+
    nagioscfg::slack::channel {'eln': } ->
    nagioscfg::contactgroup {'alerts': } ->
    nagioscfg::contact {'slack-alerts':
diff --git a/monitor-fre-3.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc b/monitor-fre-3.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
index ca59d683..034ebde7 100644
--- a/monitor-fre-3.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
+++ b/monitor-fre-3.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
@@ -3,22 +3,22 @@ STATUS=UPDATED
 -----BEGIN PGP MESSAGE-----
 Version: GnuPG v2
 
-hQEMA0scBZPXCtpJAQf+NFbwIDf0F/he4BYgHIYCzngcLlftNCnnWF1vhNS2N3xb
-j2cXWPkWMormwrCH3vdHjgDCeyQTQa1mT3AKU96YS3Ki23InHXm2k89E8Nc15pYU
-nXIy+kJfm1KEW9JI+b9O2o4W3LxbmrFtsbDNYN33RqMyMHNUBa+Kw6RqgJU0xfV1
-49ft1soG8kkw72yWRPyzDuk41ajBilWnBuUtRZgluuaCN0JxMKJjkIeC+d9t/jhN
-j9qKasZ7KUG2AmFMNTO+eXnSkiMccR2eC8K4ViESVRRnZVuyPTaM3rV3s2dl2xtU
-BF5AY7OkQamKLx3Q7UYFFIepUBxRGBDOIVvLTgIKVNLBNgFf2504D8bOdIQxnvvB
-wYUbaRGxpZX4Cqeod1P65OKrvt3rZnlKNoLDuLf4Gia7p85eMWz8K5N9yySAdtGM
-C7w5MRC6ASXLTfc1gHskowQ5XtuaoJxAKWCjWcY1wlMAnu9IC7+bRjxx1Gk8mArq
-zJhbErAeQ2/u3rjFHhkvJNjYqentax2d2uNr2kaUbwkftpXQYHlQX4/5D+zYxC6u
-CvkhAsV1AdFbQyk78rO6udvGRlc9cWx7p/mIs4eUotje6VjT6eKJtiLvsrfaGhUS
-WRjzSKqn2SybOSu/vkB5G9nkfeOMBDNlitPepA0d0I1+D3LYInfZBVQiUWTvRe7f
-GN2kP8xg70v8RHGPgUZr1EHVAK3jlqcGU6jUSwW8PGf+hBVMOoENdUJVRfVwmoR2
-6Vk/xu6n50sIULVEon2oXxlsX//OrXUdTHQjEpiIlGxKwo6d2UwFspgntHNoaws9
-E0scfaKeq2S80P+t3E8Vp0kRWKCQCFY3yrJci4uI7rYQ32wIjKktAmzmyM808SAx
-eX+H4FLrfnJPkhJOvxb7HOYtHo5NlFd+P+wubk3yN++45/k/sMa3u+n6QFY4Pvng
-SDIHg2uJx0sSHCcu7YbG3eAsx5+Sg2VZD/ZfVpOOK06ne6iXZn6uS5fGW3HHs9YD
-AwK7B7dgqWY=
-=z9lm
+hQEMA0scBZPXCtpJAQf+KudIFyFPhCPG6EGctrXrJYyVSwRaePO+tgis5MM/mjOg
+pKR2uB0ON+tboWNokG8xS470iz1SmRDxVI3YFSXG0K6SA097HJaSP4OTEJTMQI8x
+RLurLiQv6ua92bXMw747r11ETJUvcnnMR2mUDcPpkENGum8pSLEc2TmQh3/dTLia
+lvId/Aa77x1pqfbBCtStGntQEZ3Xxf0Q5RBjxyGSO8nRk/rEe8xKhIthVF0knBI0
+6JjqDr9OJJp5+L66od/1g9mSp8KzInH2JBAnALqHTqNy7SzSENJAFlrrb/8Tot27
+PfFPNiRwxhJ+fUGJsA9rCI2mZFq5BSqGTQ4f+i5vv9LpAeoLOz01enp5aO05Tl9i
+ihxEF+ZjgGVlGr7QDy1Z4sCZ8yRIaI5mp5A2M0Y2VouJuUPgYCBBagHPS0Tqhc6d
+zk7jkO4z2QdrHkAe73z/ID7BWOQ2fQ5oDTDPAHpINiUZC7D8jyWCIn2mMAD/dRkP
+RDqlUop8Mf+A5gcANp8mvNY+PCoNiquiQ578lmVwALUXFrWzR18ST0U1GIrZ7fSL
+zwxnFu2zYtbwmEN1v5UkODaZcOYD+ZOaf91TgILpZrxPZMXfEB7zY0grfuT3MW6j
+e/zsboyynsmqH+Bp2A4lJpdT49bbyIfNgdHqeBvVnPnYaWuKkhdCAnHO8tZH8fD8
+Q+cSozga2csYFEc0f+2GclKmtRaf6HWgGgB2KSguirBDP4/vLXIW8lP9NRprZ/V7
+IMGUdXrPk64ysPpuXcXHy7i8UttHhQyitpLnzvYdLO7wuQI9tT8FMuL+pA/fWsjF
+o2Shk61QcWlnK1y7Iocc7FkmFVM+IOza7fKQWInxNq4+f9LUECswUeRDfRJfVRvV
+VZU3zWT1a5hG3iwvxHRH8BINtAEzty/bbwJ/hKJQ8UyxhVGKvnD9c+gUkcoKa0xF
+T0EB4G/lChHKVbbp4djKhBxCGWvEJ/yGNsjnwIXGdhrjNhYKSnzt9ksyefjvOIDx
+n4CQcHzeYU0m3YaiUyxwvLUaDZwq/JEpgiSk9qHR6VCmua+kflMV/SzxHho=
+=LlNE
 -----END PGP MESSAGE-----