diff --git a/lib/transfer.c b/lib/transfer.c
index 57afd663667d4e439914bedada82e409ce3860ed..c6a6f094cc4ffb25e8c8142822dcf76767d6f68c 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -768,8 +768,8 @@ CURLcode Curl_readwrite(struct connectdata *conn,
                  * are definitely errors, so give up here.
                  */
                 if (data->set.http_fail_on_error && (k->httpcode >= 400) &&
-                    ((k->httpcode != 401) || !data->set.userpwd) &&
-                    ((k->httpcode != 407) || !data->set.proxyuserpwd) ) {
+                    ((k->httpcode != 401) || !conn->bits.user_passwd) &&
+                    ((k->httpcode != 407) || !conn->bits.proxy_user_passwd) ) {
 
                   if (data->reqdata.resume_from &&
                       (data->set.httpreq==HTTPREQ_GET) &&