diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 72864fe394ec2d4793b27aef4797304744ef30a2..bca5d77bbc79e66afcc7e286dcacf69cd35a42fb 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -133,7 +133,7 @@
     - name: Install - Store the previously obtained OTP
       no_log: yes
       set_fact:
-        ipaadmin_orig_password: "{{ ipaadmin_password }}"
+        ipaadmin_orig_password: "{{ ipaadmin_password | default(omit) }}"
         ipaadmin_password: "{{ result_ipaclient_get_otp.host.randompassword
                                if result_ipaclient_get_otp.host is defined }}"