diff --git a/roles/ssh_keys/tasks/main.yml b/roles/ssh_keys/tasks/main.yml
index d4b1f465..58fdef0c 100644
--- a/roles/ssh_keys/tasks/main.yml
+++ b/roles/ssh_keys/tasks/main.yml
@@ -9,8 +9,7 @@
     name: "{{ ssh_user.name }}"
     state: "present"
   when:
-    - "ssh_user.name | default('')"
-    - "ssh_user.name | length > 0"
+    - "ssh_user.name | default('') | length > 0"
     - "ssh_user.create_user_account | default(false) | bool"
   loop: "{{ ssh_user_list }}"
   loop_control:
@@ -22,8 +21,7 @@
     key: "{{ ssh_user.authorized_keys | default([]) | join('\n') }}"
     exclusive: "{{ ssh_authorized_keys_exclusive }}"
   when:
-    - "ssh_user.name | default('')"
-    - "ssh_user.name | length > 0"
+    - "ssh_user.name | default('') | length > 0"
   loop: "{{ ssh_user_list }}"
   loop_control:
     loop_var: "ssh_user"