diff --git a/ChangeLog b/ChangeLog
index 4b0510b..794aecd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 ChangeLog for davfs2
 --------------------
 
+2009-10-17 Werner Baumann (werner.baumann@onlinehome.de)
+    * mount_davfs.c, parse_secrets:
+      Check for tty before calling dav_user_input_hidden.
+
 2009-10-14 Werner Baumann (werner.baumann@onlinehome.de)
     * configure.ac:
       Add support for neon 0.29.
diff --git a/THANKS b/THANKS
index 1c5b193..756fb14 100644
--- a/THANKS
+++ b/THANKS
@@ -38,6 +38,7 @@ Hyunsop Kim <hskim@taegu.ac.kr>
 Vítězslav Kotrla <vitko@post.cz>
 Alexander Jenisch <enti@users.sourceforge.net>
 joe <josephb@users.sourceforge.net>
+Doug Kelly <dougk@dougk-ff7.net>
 Thomas Kemmer <tkemmer@users.sourceforge.net>
 SungHun Kim <hunkim@users.sourceforge.net>
 Alan Knowles <alan_k@users.sourceforge.net>
diff --git a/src/mount_davfs.c b/src/mount_davfs.c
index 1792f95..6a5adc1 100644
--- a/src/mount_davfs.c
+++ b/src/mount_davfs.c
@@ -1149,7 +1149,11 @@ parse_secrets(dav_args *args)
     if (args->askauth && args->useproxy && args->p_user && !args->p_passwd) {
         printf(_("Please enter the password to authenticate user %s with proxy\n"
                  "%s or hit enter for none.\n"), args->p_user, args->p_host);
-        args->p_passwd = dav_user_input_hidden(_("Password: "));
+        if (isatty(fileno(stdin))) {
+            args->p_passwd = dav_user_input_hidden(_("Password: "));
+        } else {
+            args->p_passwd = user_input(_("Password: "));
+        }
         if (args->p_passwd && strlen(args->p_passwd) == 0) {
             free(args->p_passwd);
             args->p_passwd = NULL;
@@ -1165,7 +1169,11 @@ parse_secrets(dav_args *args)
     if (args->askauth && args->username && !args->password) {
         printf(_("Please enter the password to authenticate user %s with "
                  "server\n%s or hit enter for none.\n"), args->username, url);
-        args->password = dav_user_input_hidden(_("Password: "));
+        if (isatty(fileno(stdin))) {
+            args->password = dav_user_input_hidden(_("Password: "));
+        } else {
+            args->password = user_input(_("Password: "));
+        }
         if (args->password && strlen(args->password) == 0) {
             free(args->password);
             args->password = NULL;