diff --git a/ansible/roles/semaphore/tasks/main.yml b/ansible/roles/semaphore/tasks/main.yml
index 2cfeadd..080a271 100644
--- a/ansible/roles/semaphore/tasks/main.yml
+++ b/ansible/roles/semaphore/tasks/main.yml
@@ -92,12 +92,12 @@
       --login {{ semaphore_admin_user }}
       --name "{{ semaphore_admin_name }}"
       --email {{ semaphore_admin_email }}
-      --password {{ semaphore_admin_password }}
+      --password {{ semaphore_admin_password | default(vault_semaphore_admin_password) }}
   register: create_admin_result
   changed_when: create_admin_result.rc == 0
   failed_when: create_admin_result.rc != 0 and 'already exists' not in create_admin_result.stderr
   when:
-    - semaphore_admin_password is defined
+    - semaphore_admin_password is defined or vault_semaphore_admin_password is defined or vault_semaphore_admin_password is defined
     - semaphore_admin_user not in semaphore_user_list.stdout
   no_log: true
 
@@ -119,11 +119,11 @@
       --login {{ semaphore_admin_user }}
       --name "{{ semaphore_admin_name }}"
       --email {{ semaphore_admin_email }}
-      --password {{ semaphore_admin_password }}
+      --password {{ semaphore_admin_password | default(vault_semaphore_admin_password) }}
   register: create_admin_result
   changed_when: create_admin_result.rc == 0
   failed_when: create_admin_result.rc != 0
   when:
     - semaphore_force_admin_user | bool
-    - semaphore_admin_password is defined
+    - semaphore_admin_password is defined or vault_semaphore_admin_password is defined or vault_semaphore_admin_password is defined
   no_log: true