diff --git a/roles/ipaserver/library/ipaserver_master_password.py b/roles/ipaserver/library/ipaserver_master_password.py
index f6f15dc8..0509f204 100644
--- a/roles/ipaserver/library/ipaserver_master_password.py
+++ b/roles/ipaserver/library/ipaserver_master_password.py
@@ -46,7 +46,7 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-value:
+password:
   description: The master password
   returned: always
 '''
@@ -87,7 +87,7 @@ def main():
         options.master_password = ipa_generate_password()
 
     module.exit_json(changed=True,
-                     value=options.master_password)
+                     password=options.master_password)
 
 if __name__ == '__main__':
     main()
diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index e00ad8dd..e30830cb 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -103,9 +103,8 @@
       register: ipaserver_master_password
 
     - name: Install - Use new master password
-      no_log: yes
       set_fact:
-        ipaserver_master_password: "{{ ipaserver_master_password.value }}"
+        ipaserver_master_password: "{{ ipaserver_master_password.password }}"
 
     when: ipaserver_master_password is undefined