diff --git a/roles/global_defaults/tasks/validation.yml b/roles/global_defaults/tasks/validation.yml
index 78df216..4a71b18 100644
--- a/roles/global_defaults/tasks/validation.yml
+++ b/roles/global_defaults/tasks/validation.yml
@@ -266,8 +266,10 @@
     that:
       - system_cfg.users | default([]) | length > 0
       - system_cfg.users[0].name is defined and (system_cfg.users[0].name | string | length) > 0
-    fail_msg: "At least one user with a name must be defined in system.users[]."
+      - system_cfg.users[0].password is defined and (system_cfg.users[0].password | string | length) > 0
+    fail_msg: "At least one user with a name and password must be defined in system.users[]."
     quiet: true
+  no_log: true
 
 - name: Validate DNS servers is a list
   when: