diff --git a/src/main/java/com/openshift/internal/client/httpclient/UrlConnectionHttpClient.java b/src/main/java/com/openshift/internal/client/httpclient/UrlConnectionHttpClient.java
index 38b51f91..5abbc2a8 100755
--- a/src/main/java/com/openshift/internal/client/httpclient/UrlConnectionHttpClient.java
+++ b/src/main/java/com/openshift/internal/client/httpclient/UrlConnectionHttpClient.java
@@ -76,7 +76,7 @@ public UrlConnectionHttpClient(String username, String password, String userAgen
 			IMediaType requestMediaType, String acceptedMediaType, String version, String authKey, String authIV) {
 		this.username = username;
 		this.password = password;
-		this.userAgent = userAgent;
+		this.userAgent = setupUserAgent(authKey, authIV, userAgent);
 		this.sslChecks = sslChecks;
 		this.requestMediaType = requestMediaType;
 		this.acceptedMediaType = acceptedMediaType;
@@ -84,6 +84,17 @@ public UrlConnectionHttpClient(String username, String password, String userAgen
 		this.authIV = authIV;
 	}
 	
+	private String setupUserAgent(String authKey, String authIV, String userAgent) {
+		if (!StringUtils.isEmpty(authKey)) {
+			if (userAgent == null) {
+				userAgent = "OpenShift";
+			} else if (!userAgent.startsWith("OpenShift")) {
+				userAgent = "OpenShift-" + userAgent;
+			}
+		}
+		return userAgent;
+	}
+
 	public void setAcceptedMediaType(String acceptedMediaType) {
 		this.acceptedMediaType = acceptedMediaType;
 	}
diff --git a/src/main/java/com/openshift/internal/client/httpclient/UrlConnectionHttpClientBuilder.java b/src/main/java/com/openshift/internal/client/httpclient/UrlConnectionHttpClientBuilder.java
index f687cb36..aaef7d22 100755
--- a/src/main/java/com/openshift/internal/client/httpclient/UrlConnectionHttpClientBuilder.java
+++ b/src/main/java/com/openshift/internal/client/httpclient/UrlConnectionHttpClientBuilder.java
@@ -65,13 +65,6 @@ public UrlConnectionHttpClientBuilder setVersion(String version) {
 	}
 
 	public IHttpClient client() {
-		if (authKey != null && authKey.trim().length() > 0) {
-			if (userAgent == null) {
-				userAgent = "OpenShift";
-			} else if (!userAgent.startsWith("OpenShift")) {
-				userAgent = "OpenShift-" + userAgent;
-			}
-		}
 		return new UrlConnectionHttpClient(username, password, userAgent,
 				sslChecks, requestMediaType, acceptedMediaType, version,
 				authKey, authIV);
diff --git a/src/main/java/com/openshift/internal/client/utils/StringUtils.java b/src/main/java/com/openshift/internal/client/utils/StringUtils.java
index 0bce0adb..82a96a99 100644
--- a/src/main/java/com/openshift/internal/client/utils/StringUtils.java
+++ b/src/main/java/com/openshift/internal/client/utils/StringUtils.java
@@ -32,7 +32,7 @@ public static String toLowerCase(Enum<?> aEnum) {
 
 	public static boolean isEmpty(String string) {
 		return string == null
-				|| string.isEmpty();
+				|| string.trim().isEmpty();
 	}
 	
 }