diff --git a/bin/ansible b/bin/ansible
index dbcca4bedf..38b74b3670 100755
--- a/bin/ansible
+++ b/bin/ansible
@@ -75,6 +75,7 @@ class Cli(object):
 
         sshpass = None
         sudopass = None
+        options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS
         if options.ask_pass:
             sshpass = getpass.getpass(prompt="SSH password: ")
         options.ask_sudo_pass= options.ask_sudo_pass or C.DEFAULT_ASK_SUDO_PASS
diff --git a/bin/ansible-playbook b/bin/ansible-playbook
index d18291def6..2064ee6ec6 100755
--- a/bin/ansible-playbook
+++ b/bin/ansible-playbook
@@ -70,6 +70,7 @@ def main(args):
     sshpass = None
     sudopass = None
     if not options.listhosts:
+        options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS
         if options.ask_pass:
             sshpass = getpass.getpass(prompt="SSH password: ")
         options.ask_sudo_pass = options.ask_sudo_pass or C.DEFAULT_ASK_SUDO_PASS
diff --git a/examples/ansible.cfg b/examples/ansible.cfg
index 1ba209dd8d..207e060add 100644
--- a/examples/ansible.cfg
+++ b/examples/ansible.cfg
@@ -46,12 +46,16 @@ poll_interval=15
 
 sudo_user=root
 
-# to force ansible to always ask for the sudo password (instead of having
-# to add -K to the commandline). Or you can use the environment
-# variable (ANSIBLE_ASK_SUDO_PASS)
+# the following forces ansible to always ask for the sudo password (instead of having
+# to add -K to the commandline). Or you can use the environment variable (ANSIBLE_ASK_SUDO_PASS)
 
 #ask_sudo_pass=True
 
+# the following forces ansible to always ask for the ssh-password (-k)
+# can also be set by the environment variable ANSIBLE_ASK_PASS
+
+#ask_pass=True
+
 # connection to use when -c <connection_type> is not specified
 
 transport=paramiko
diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py
index 921b328001..b97cfab85c 100644
--- a/lib/ansible/constants.py
+++ b/lib/ansible/constants.py
@@ -80,6 +80,7 @@ DEFAULT_MODULE_ARGS       = get_config(p, DEFAULTS, 'module_args',      'ANSIBLE
 DEFAULT_TIMEOUT           = get_config(p, DEFAULTS, 'timeout',          'ANSIBLE_TIMEOUT',          10)
 DEFAULT_POLL_INTERVAL     = get_config(p, DEFAULTS, 'poll_interval',    'ANSIBLE_POLL_INTERVAL',    15)
 DEFAULT_REMOTE_USER       = get_config(p, DEFAULTS, 'remote_user',      'ANSIBLE_REMOTE_USER',      active_user)
+DEFAULT_ASK_PASS          = get_config(p, DEFAULTS, 'ask_pass',  'ANSIBLE_ASK_PASS',    False)
 DEFAULT_PRIVATE_KEY_FILE  = shell_expand_path(get_config(p, DEFAULTS, 'private_key_file', 'ANSIBLE_PRIVATE_KEY_FILE', None))
 DEFAULT_SUDO_USER         = get_config(p, DEFAULTS, 'sudo_user',        'ANSIBLE_SUDO_USER',        'root')
 DEFAULT_ASK_SUDO_PASS     = get_config(p, DEFAULTS, 'ask_sudo_pass',    'ANSIBLE_ASK_SUDO_PASS',    False)
diff --git a/library/ini_file b/library/ini_file
index 744f5d6baa..63131d5232 100755
--- a/library/ini_file
+++ b/library/ini_file
@@ -63,14 +63,14 @@ options:
        - all arguments accepted by the M(file) module also work here
      required: false
 examples:
-   - code: "ini_file: dest=/etc/conf section=drinks option=fav value=lemonade mode=0600 backup=true"
+   - code: "ini_file: dest=/etc/conf section=drinks option=fav value=lemonade mode=0600 backup=yes"
      description: Ensure C(fav=lemonade) is in section C([drinks]) in said file
    - code: |
            ini_file: dest=/etc/anotherconf
                      section=drinks
                      option=temperature
                      value=cold
-                     backup=true
+                     backup=yes
 notes:
    - While it is possible to add an I(option) without specifying a I(value), this makes
      no sense.