diff --git a/tasks/main.yml b/tasks/main.yml
index ed8d747..67e437d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -58,7 +58,7 @@
         remove: "{{ item.remove_data | default(false) }}"
         force: true
       loop: '{{ users_system_users }}'
-      no_log: false
+      no_log: true
 
     - name: Ensure that the users can login with their ssh keys
       ansible.posix.authorized_key:
@@ -78,7 +78,7 @@
         append: true
       loop: '{{ users_system_users }}'
       when:
-        - item.admin
+        - item.admin is defined and item.admin
         - item.state is not defined or item.state != "present"
 
 - name: Manage additional users
@@ -100,7 +100,7 @@
         remove: "{{ item.remove_data | default(false) }}"
         force: true
       loop: '{{ users_system_users_adjunct }}'
-      no_log: false
+      no_log: true
 
     - name: Ensure that the additional users can login with their ssh keys
       ansible.posix.authorized_key:
@@ -120,7 +120,7 @@
         append: true
       loop: '{{ users_system_users_adjunct }}'
       when:
-        - item.admin
+        - item.admin is defined and item.admin
         - item.state is not defined or item.state != "present"
 
 - name: Configure passwordless sudo