diff --git a/tasks/Debian/podman.yaml b/tasks/Debian/podman.yaml
index 5afb6ec..640b0f0 100644
--- a/tasks/Debian/podman.yaml
+++ b/tasks/Debian/podman.yaml
@@ -22,7 +22,7 @@
 
     - name: Force login and password change for first admin user
       template:
-        dest: "{{ wireguard_ui_config_dir }}/users/admin.json"
+        dest: "{{ wireguard_ui_config_dir }}/users/{{ wireguard_ui_combined_env['WGUI_USERNAME'] }}.json"
         src: admin.json.j2
       register: wireguard_ui_auth
       notify: Restart WireGuard UI with podman
diff --git a/tasks/RedHat/podman.yaml b/tasks/RedHat/podman.yaml
index 5afb6ec..a751eb1 100644
--- a/tasks/RedHat/podman.yaml
+++ b/tasks/RedHat/podman.yaml
@@ -22,7 +22,7 @@
 
     - name: Force login and password change for first admin user
       template:
-        dest: "{{ wireguard_ui_config_dir }}/users/admin.json"
+        dest: "{{ wireguard_ui_config_dir }}/users/{{ wireguard_ui_combined_env['WGUI_USERNAME']}}.json"
         src: admin.json.j2
       register: wireguard_ui_auth
       notify: Restart WireGuard UI with podman