diff --git a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
index 7940de0..8376f9a 100644
--- a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
+++ b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
@@ -862,26 +862,24 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 		}
 	}
 
-	protected void setAuthHeaders(HttpUriRequestBase method, String authorization) throws Exception {
-		method.setHeader("Authorization",
-				String.format("%s", authorization));
-	}
-
-	protected void setAuthHeaders(HttpUriRequestBase method, String authorization, String authorizationHeaderName) throws Exception {
-		if(StringUtils.isEmpty(authorizationHeaderName))
+	protected void setAuthHeaders(HttpUriRequestBase method, String authorization, String authorizationHeaderName)
+			throws Exception {
+		if (StringUtils.isEmpty(authorizationHeaderName))
 			authorizationHeaderName = "Authorization";
-		method.setHeader(authorizationHeaderName,
-				String.format("%s", authorization));
+		
+		method.setHeader(authorizationHeaderName, String.format("%s", authorization));
 	}
 
-	protected void setAuthHeaders(HttpUriRequestBase method, OAuth2AccessTokenVO accessToken) throws Exception {
-		method.setHeader("Authorization",
-				String.format("%s %s", AccessTokenVO.BEARER_TYPE, accessToken.getAccessToken()));
-	}
-	
-	protected void setAuthHeaders(HttpUriRequestBase method, OAuth2AccessTokenVO accessToken, String authorizationHeaderName) throws Exception {
-		method.setHeader(authorizationHeaderName,
-				String.format("%s %s", AccessTokenVO.BEARER_TYPE, accessToken.getAccessToken()));
+	protected void setAuthHeaders(HttpUriRequestBase method, OAuth2AccessTokenVO accessToken,
+			String authorizationHeaderName) throws Exception {
+		if (StringUtils.isEmpty(authorizationHeaderName))
+			authorizationHeaderName = "Authorization";
+
+		if (StringUtils.isEmpty(accessToken.getTokenType()))
+			method.setHeader(authorizationHeaderName, String.format("%s", accessToken.getAccessToken()));
+		else
+			method.setHeader(authorizationHeaderName,
+					String.format("%s %s", AccessTokenVO.BEARER_TYPE, accessToken.getAccessToken()));
 	}
 
 	private boolean checkTokenRetry(byte[] responseMessage, String tokenErrorCodeKey, String tokenErrorCodeValues,
diff --git a/src/main/java/com/openbanking/eai/common/token/OAuth2AccessTokenVO.java b/src/main/java/com/openbanking/eai/common/token/OAuth2AccessTokenVO.java
index 920121c..8acf344 100644
--- a/src/main/java/com/openbanking/eai/common/token/OAuth2AccessTokenVO.java
+++ b/src/main/java/com/openbanking/eai/common/token/OAuth2AccessTokenVO.java
@@ -56,7 +56,10 @@ public class OAuth2AccessTokenVO implements AccessTokenVO, Serializable
 	}
 
 	public void setTokenType(String tokenType) {
-		this.tokenType = tokenType;
+		if(tokenType.equalsIgnoreCase(BEARER_TYPE))
+			this.tokenType = BEARER_TYPE;
+		else
+			this.tokenType = tokenType;
 	}
 
 	public long getExpiresIn() {