diff --git a/rhc-ose-ansible/roles/subscription-manager/pre_tasks/pre_tasks.yml b/rhc-ose-ansible/roles/subscription-manager/pre_tasks/pre_tasks.yml
index 8a4d8d0..b21356c 100644
--- a/rhc-ose-ansible/roles/subscription-manager/pre_tasks/pre_tasks.yml
+++ b/rhc-ose-ansible/roles/subscription-manager/pre_tasks/pre_tasks.yml
@@ -1,12 +1,8 @@
 ---
 - name: "Set password fact"
   set_fact:
-    rhsm_password: "{{ rhsm_password }}"
+    rhsm_password: "{{ rhsm_password | default(None) }}"
   no_log: true
-  when:
-    - rhsm_password is defined
-    - rhsm_password is not none
-    - rhsm_password|trim != ''
 
 - name: "Initialize Subscription Manager fact"
   set_fact: