diff --git a/Sources/KituraNet/ClientRequest.swift b/Sources/KituraNet/ClientRequest.swift
index 6bee4d34..08cebdfa 100644
--- a/Sources/KituraNet/ClientRequest.swift
+++ b/Sources/KituraNet/ClientRequest.swift
@@ -272,9 +272,17 @@ public class ClientRequest {
         if let username = url.user {
             self.userName = username
         }
+
         if let password = url.password {
             self.password = password
         }
+
+        if let username = self.userName, let password = self.password {
+            self.headers["Authorization"] = createHTTPBasicAuthHeader(username: username, password: password)
+        }
+
+        self.url = "\(url.scheme ?? "http")://\(self.hostName ?? "unknown")\(self.port.map { ":\($0)" } ?? "")/\(fullPath)"
+        
     }
 
     /**
@@ -355,17 +363,11 @@ public class ClientRequest {
             }
         }
 
-        // Support for Basic HTTP authentication
-        let user = self.userName ?? ""
-        let pwd = self.password ?? ""
-        var authenticationClause = ""
-        // If either the userName or password are non-empty, add the authenticationClause
-        if !user.isEmpty || !pwd.isEmpty {
-          authenticationClause = "\(user):\(pwd)@"
+        if let username = self.userName, let password = self.password {
+            self.headers["Authorization"] = createHTTPBasicAuthHeader(username: username, password: password)
         }
-
         //the url string
-        self.url = "\(theSchema)\(authenticationClause)\(hostName)\(port)\(path)"
+        self.url = "\(theSchema)\(hostName)\(port)\(path)"
         self.percentEncodedURL = percentEncode(self.url)
     }
 
@@ -567,10 +569,6 @@ public class ClientRequest {
             self.headers["Connection"] = "close"
         }
 
-        if let username = self.userName, let password = self.password {
-            self.headers["Authorization"] = createHTTPBasicAuthHeader(username: username, password: password)
-        }
-
         if self.port == nil {
             self.port = isHTTPS ? 443 : 80
         }
diff --git a/Tests/KituraNetTests/ClientRequestTests.swift b/Tests/KituraNetTests/ClientRequestTests.swift
index 1a6a850e..e443e24a 100644
--- a/Tests/KituraNetTests/ClientRequestTests.swift
+++ b/Tests/KituraNetTests/ClientRequestTests.swift
@@ -23,6 +23,12 @@ class ClientRequestTests: KituraNetTest {
     let testCallback: ClientRequest.Callback = {_ in }
     // 1 test URL that is build when initializing with ClientRequestOptions
 
+    private func httpBasicAuthHeader(username: String, password: String) -> String {
+        let authHeader = "\(username):\(password)"
+        let data = Data(authHeader.utf8)
+        return "Basic \(data.base64EncodedString())"
+    }
+
     func testClientRequestWhenInitializedWithValidURL() {
         let options: [ClientRequest.Options] = [ .method("GET"),
                                                  .schema("https://"),
@@ -91,14 +97,15 @@ class ClientRequestTests: KituraNetTest {
         testRequest.set(.headers(["X-Custom": "Swift"]))
         testRequest.set(.maxRedirects(3))
         testRequest.set(.disableSSLVerification)
-        XCTAssertEqual(testRequest.url, "https://66o.tech:8080")
+        XCTAssertEqual(testRequest.url, "https://66o.tech:8080/")
     }
 
     func testClientRequestParse() {
         let options = ClientRequest.parse("https://username:password@66o.tech:8080/path?key=value")
         let testRequest = ClientRequest(options: options, callback: testCallback)
-        XCTAssertEqual(testRequest.url, "https://username:password@66o.tech:8080/path?key=value")
-
+        XCTAssertEqual(testRequest.url, "https://66o.tech:8080/path?key=value")
+        let authHeaderValue = testRequest.headers["Authorization"] ?? ""
+        XCTAssertEqual(authHeaderValue, httpBasicAuthHeader(username: "username", password: "password"))
         let options1: [ClientRequest.Options] = [ .schema("https"),
                                                   .hostname("66o.tech"),
                                                   .path("/view/matching?key=\"viewTest\"")
@@ -121,14 +128,18 @@ class ClientRequestTests: KituraNetTest {
                                              .hostname("66o.tech")
         ]
         var testRequest = ClientRequest(options: options, callback: testCallback)
-        XCTAssertEqual(testRequest.url, "http://myusername:@66o.tech")
+        XCTAssertNil(testRequest.headers["Authorization"])
+        XCTAssertEqual(testRequest.userName, "myusername")
+        XCTAssertEqual(testRequest.url, "http://66o.tech")
 
         // ensure an empty username works
         let options2: [ClientRequest.Options] = [ .password("mypassword"),
                                                   .hostname("66o.tech")
         ]
         testRequest = ClientRequest(options: options2, callback: testCallback)
-        XCTAssertEqual(testRequest.url, "http://:mypassword@66o.tech")
+        XCTAssertNil(testRequest.headers["Authorization"])
+        XCTAssertEqual(testRequest.password, "mypassword")
+        XCTAssertEqual(testRequest.url, "http://66o.tech")
 
         // ensure username:password works
         let options3: [ClientRequest.Options] = [ .username("myusername"),
@@ -136,7 +147,9 @@ class ClientRequestTests: KituraNetTest {
                                                   .hostname("66o.tech")
         ]
         testRequest = ClientRequest(options: options3, callback: testCallback)
-        XCTAssertEqual(testRequest.url, "http://myusername:mypassword@66o.tech")
+        let authHeaderValue = testRequest.headers["Authorization"] ?? ""
+        XCTAssertEqual(authHeaderValue, httpBasicAuthHeader(username: "myusername", password: "mypassword"))
+        XCTAssertEqual(testRequest.url, "http://66o.tech")
     }
 
     func testClientRequestSyncBehavior() {