Index: src/OFHTTPClient.m
==================================================================
--- src/OFHTTPClient.m
+++ src/OFHTTPClient.m
@@ -394,11 +394,12 @@
 			    forKey: @"Host"];
 
 	user = [URL user];
 	password = [URL password];
 
-	if ([user length] > 0 || [password length] > 0) {
+	if (([user length] > 0 || [password length] > 0) &&
+	    [headers objectForKey: @"Authorization"] == nil) {
 		OFDataArray *authorizationData = [OFDataArray dataArray];
 		OFString *authorization;
 
 		[authorizationData addItems: [user UTF8String]
 				      count: [user UTF8StringLength]];
@@ -432,11 +433,12 @@
 					    @"urlencoded; charset=UTF-8"
 				    forKey: @"Content-Type"];
 	}
 
 	if ([request protocolVersion].major == 1 &&
-	    [request protocolVersion].minor == 0)
+	    [request protocolVersion].minor == 0 &&
+	    [headers objectForKey: @"Connection"] == nil)
 		[headers setObject: @"keep-alive"
 			    forKey: @"Connection"];
 
 	keyEnumerator = [headers keyEnumerator];
 	objectEnumerator = [headers objectEnumerator];