diff --git a/charts/icinga-stack/charts/icingaweb2/values.yaml b/charts/icinga-stack/charts/icingaweb2/values.yaml
index 26eefcb..1b0519d 100644
--- a/charts/icinga-stack/charts/icingaweb2/values.yaml
+++ b/charts/icinga-stack/charts/icingaweb2/values.yaml
@@ -33,7 +33,7 @@ ingress:
 auth:
   type: db
   #resource: # Add the name of the db resource used by Icinga Web 2 here
-  admin_user: icingaweb
+  admin_user: icingaadmin
   admin_password:
     value: # Add a password here
     credSecret: # Or use existing secret
diff --git a/charts/icinga-stack/docs/configuration.md b/charts/icinga-stack/docs/configuration.md
index 4c4f97a..7d1b63f 100644
--- a/charts/icinga-stack/docs/configuration.md
+++ b/charts/icinga-stack/docs/configuration.md
@@ -147,7 +147,7 @@ These values are used by the Icinga Web sub-chart. For configuration of Icinga W
 | `icingaweb2.ingress.tls[].hosts` | Hosts of the Icinga Web ingress | `[]string` | **not set** |
 | `icingaweb2.ingress.tls[].secretName` | Secret name of the Icinga Web ingress | `string` | **not set** |
 | `icingaweb2.auth.type` | Type of the Icinga Web authentication | `string` | `db` |
-| `icingaweb2.auth.admin_user` | Admin user of the Icinga Web authentication | `string` | `icingaweb` |
+| `icingaweb2.auth.admin_user` | Admin user of the Icinga Web authentication | `string` | `icingaadmin` |
 | `icingaweb2.auth.admin_password.value` | Admin password of the Icinga Web authentication. Can be set from secret specified in `icingaweb2.auth.admin_password.credSecret` and `icingaweb2.auth.admin_password.secretKey` | `string` | **not set** |
 | `icingaweb2.modules.<module>.enabled` | Whether or not to enable the Icinga Web module | `boolean` | **varies** |
 | `icingaweb2.resources` | Resources of the Icinga Web deployment | `map[string]string` | `{}` |
diff --git a/charts/icinga-stack/tests/icingaweb2_deployment_test.yaml b/charts/icinga-stack/tests/icingaweb2_deployment_test.yaml
index bb415ed..0d72d7d 100644
--- a/charts/icinga-stack/tests/icingaweb2_deployment_test.yaml
+++ b/charts/icinga-stack/tests/icingaweb2_deployment_test.yaml
@@ -23,7 +23,7 @@ tests:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: icingaweb.passwords.icingaweb2.icingaweb
+            name: icingaweb.passwords.icingaweb2.icingaadmin
             value: insecurepassword
 
   - it: deploys an Icinga Web deployment with additional modules
@@ -74,7 +74,7 @@ tests:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: icingaweb.passwords.icingaweb2.icingaweb
+            name: icingaweb.passwords.icingaweb2.icingaadmin
             valueFrom:
               secretKeyRef:
                 name: icingaweb2-secret
diff --git a/charts/icinga-stack/values.yaml b/charts/icinga-stack/values.yaml
index 2c33af6..1f35613 100644
--- a/charts/icinga-stack/values.yaml
+++ b/charts/icinga-stack/values.yaml
@@ -395,7 +395,7 @@ icingaweb2:
   auth:
     type: db
     #resource: # Add the name of the db resource used by Icinga Web 2 here
-    admin_user: icingaweb
+    admin_user: icingaadmin
     admin_password:
       value: # Add a password here
       credSecret: