diff --git a/roles/lmn_sssd/tasks/main.yml b/roles/lmn_sssd/tasks/main.yml
index 6dcd0a0..1cfebe7 100644
--- a/roles/lmn_sssd/tasks/main.yml
+++ b/roles/lmn_sssd/tasks/main.yml
@@ -30,6 +30,6 @@
     ad_user: "{{ 'global-admin' if (adpw.user_input | default(ansible_cmdline.adpw) | default('') | length > 0) else sssd_domjoin_user }}"
     ad_passwd: "{{ adpw.user_input | default('') if  adpw.user_input | length > 0 else ansible_cmdline.adpw | default(sssd_domjoin_passwd) | default('') }}"
   when:
-    - adpw.user_input | length > 0 or
+    - adpw.user_input | default('') | length > 0 or
       ansible_cmdline.adpw | default(sssd_domjoin_passwd) | default('') | length > 0
     - adcli_test_result.rc != 0