diff --git a/roles/matrix-maubot/defaults/main.yml b/roles/matrix-maubot/defaults/main.yml
index 9ea3b7a19..d54db7896 100644
--- a/roles/matrix-maubot/defaults/main.yml
+++ b/roles/matrix-maubot/defaults/main.yml
@@ -35,7 +35,7 @@ matrix_maubot_management_hostname: "0.0.0.0"
 matrix_maubot_shared_secret: false
 matrix_maubot_registration_shared_secret:
 matrix_maubot_cs_url: "{{ matrix_homeserver_container_url }}"
-matrix_maubot_admins: false
+matrix_maubot_admins: {}
 
 matrix_maubot_docker_image: dock.mau.dev/maubot/maubot:latest
 matrix_maubot_docker_image_force_pull: "{{ matrix_maubot_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-maubot/templates/maubot_config.yaml.j2 b/roles/matrix-maubot/templates/maubot_config.yaml.j2
index 20f2e4e55..d450efa8c 100644
--- a/roles/matrix-maubot/templates/maubot_config.yaml.j2
+++ b/roles/matrix-maubot/templates/maubot_config.yaml.j2
@@ -61,13 +61,7 @@ registration_secrets:
 
 # List of administrator users. Plaintext passwords will be bcrypted on startup. Set empty password
 # to prevent normal login. Root is a special user that can't have a password and will always exist.
-admins:
-    root: ""
-{% if matrix_maubot_admins %}
-{% for user, password in matrix_maubot_admins %}
-    {{ user }}: '{{ password }}'
-{% endfor %}
-{% endif %}
+admins: {{ matrix_maubot_admins | combine( {"root": ""} ) }}
 
 # API feature switches.
 api_features: