diff --git a/defaults/main.yml b/defaults/main.yml
index c6f98f0..6f340a9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,8 @@
 ---
 hedy_base_url: "http://localhost:8080/"
 
+hedy_admin_user: ~
+
 hedy_user_username: hedy
 hedy_user_groupname: hedy
 hedy_base_path: /home/hedy
diff --git a/tasks/main.yml b/tasks/main.yml
index 5e86677..0ff1763 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -27,6 +27,8 @@
 - name: Hedy container running
   community.docker.docker_container:
     name: "hedy"
+    comparisons:
+      env: strict
     image: "{{ hedy_docker_image }}"
     pull: "{{ hedy_pull and hedy_docker_image.endswith(':latest') }}"
     restart_policy: unless-stopped
@@ -39,3 +41,4 @@
       # https://github.com/hedyorg/hedy/wiki/Hedy-Development-Process#environment-variables
       fix_for_weblate: "true"
       save_snippet_hashes: "true"
+      ADMIN_USER: "{{ hedy_admin_user|default(omit,omit) }}"