diff --git a/src/main/java/com/iemr/common/utils/RestTemplateUtil.java b/src/main/java/com/iemr/common/utils/RestTemplateUtil.java
index 447ba80f..c8299fe7 100644
--- a/src/main/java/com/iemr/common/utils/RestTemplateUtil.java
+++ b/src/main/java/com/iemr/common/utils/RestTemplateUtil.java
@@ -10,14 +10,17 @@
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import com.iemr.common.constant.Constants;
+
 import jakarta.servlet.http.HttpServletRequest;
 
 public class RestTemplateUtil {
 	private final static Logger logger = LoggerFactory.getLogger(RestTemplateUtil.class);
-	
+
 	public static HttpEntity<Object> createRequestEntity(Object body, String authorization) {
-        
-		ServletRequestAttributes servletRequestAttributes = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes());
+
+		ServletRequestAttributes servletRequestAttributes = ((ServletRequestAttributes) RequestContextHolder
+				.getRequestAttributes());
 		if (servletRequestAttributes == null) {
 			MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
 			headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8");
@@ -25,29 +28,58 @@ public static HttpEntity<Object> createRequestEntity(Object body, String authori
 			return new HttpEntity<>(body, headers);
 		}
 		HttpServletRequest requestHeader = servletRequestAttributes.getRequest();
-        String jwtTokenFromCookie = null;
+
+		String jwtTokenFromCookie = extractJwttoken(requestHeader);
+
+		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+		headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8");
+		if (null != UserAgentContext.getUserAgent()) {
+			headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent());
+		}
+		headers.add(HttpHeaders.AUTHORIZATION, authorization);
+		if (null != requestHeader.getHeader(Constants.JWT_TOKEN)) {
+			headers.add(Constants.JWT_TOKEN, requestHeader.getHeader(Constants.JWT_TOKEN));
+		}
+		if (null != jwtTokenFromCookie) {
+			headers.add(HttpHeaders.COOKIE, "Jwttoken=" + jwtTokenFromCookie);
+		}
+
+		return new HttpEntity<>(body, headers);
+	}
+
+	private static String extractJwttoken(HttpServletRequest requestHeader) {
+		String jwtTokenFromCookie = null;
 		try {
 			jwtTokenFromCookie = CookieUtil.getJwtTokenFromCookie(requestHeader);
-			
+
 		} catch (Exception e) {
-			logger.error("Error while getting jwtToken from Cookie" + e.getMessage() );
-		}
-
-        MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-        headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8");
-        if(null != UserAgentContext.getUserAgent()) {
-        	logger.info("Common-API getting User-Agent as : "+UserAgentContext.getUserAgent());
-        	headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent());
-        }
-        headers.add(HttpHeaders.AUTHORIZATION, authorization);
-        if(null != requestHeader.getHeader("JwtToken")) {
-        	headers.add("JwtToken",requestHeader.getHeader("JwtToken"));
-        }
-        if(null != jwtTokenFromCookie) {
-        	headers.add(HttpHeaders.COOKIE, "Jwttoken=" + jwtTokenFromCookie);
-        }
-
-        return new HttpEntity<>(body, headers);
-    }
-
-}
\ No newline at end of file
+			logger.error("Error while getting jwtToken from Cookie" + e.getMessage());
+		}
+		return jwtTokenFromCookie;
+	}
+
+	public static void getJwttokenFromHeaders(HttpHeaders headers) {
+		ServletRequestAttributes servletRequestAttributes = ((ServletRequestAttributes) RequestContextHolder
+				.getRequestAttributes());
+		if (servletRequestAttributes == null) {
+			return;
+		}
+		HttpServletRequest requestHeader = servletRequestAttributes.getRequest();
+		String jwtTokenFromCookie = extractJwttoken(requestHeader);
+		if (!headers.containsKey(HttpHeaders.CONTENT_TYPE)) {
+			headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8");
+		}
+		if (null != UserAgentContext.getUserAgent()) {
+			if (!headers.containsKey(HttpHeaders.USER_AGENT)) {
+				headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent());
+			}
+		}
+		if (null != jwtTokenFromCookie) {
+			headers.add(HttpHeaders.COOKIE, Constants.JWT_TOKEN + "=" + jwtTokenFromCookie);
+		} else if (null != requestHeader.getHeader(Constants.JWT_TOKEN)) {
+			headers.add(Constants.JWT_TOKEN, requestHeader.getHeader(Constants.JWT_TOKEN));
+		}
+
+	}
+
+}
diff --git a/src/main/java/com/iemr/common/utils/http/HttpUtils.java b/src/main/java/com/iemr/common/utils/http/HttpUtils.java
index 0f308619..4f49e662 100644
--- a/src/main/java/com/iemr/common/utils/http/HttpUtils.java
+++ b/src/main/java/com/iemr/common/utils/http/HttpUtils.java
@@ -40,6 +40,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
+import com.iemr.common.utils.RestTemplateUtil;
 import com.sun.jersey.multipart.FormDataBodyPart;
 import com.sun.jersey.multipart.FormDataMultiPart;
 
@@ -54,9 +55,6 @@ public class HttpUtils {
 	// @Autowired
 	private HttpStatus status;
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-
-	// @Autowired(required = true)
-	// @Qualifier("hibernateCriteriaBuilder")
 	public HttpUtils() {
 		if (rest == null) {
 			rest = new RestTemplate();
@@ -64,33 +62,22 @@ public HttpUtils() {
 			headers.add("Content-Type", "application/json");
 		}
 	}
-	// public HttpUtils() {
-	// if (rest == null) {
-	// rest = new RestTemplate();
-	// headers = new HttpHeaders();
-	// headers.add("Content-Type", "application/json");
-	// }
-	// }
-
-	// @Bean
-	// public HttpUtils httpUtils() {
-	// return new HttpUtils();
-	// }
-
+	
 	public String get(String uri) {
 		String body;
-		HttpEntity<String> requestEntity = new HttpEntity<String>("", headers);
+		HttpHeaders requestHeaders = new HttpHeaders();
+		requestHeaders.add("Content-Type", "application/json");
+		RestTemplateUtil.getJwttokenFromHeaders(requestHeaders);
+		HttpEntity<String> requestEntity = new HttpEntity<String>("", requestHeaders);
 		ResponseEntity<String> responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class);
 		setStatus((HttpStatus) responseEntity.getStatusCode());
-		// if (status == HttpStatus.OK){
 		body = responseEntity.getBody();
-		// }else{
-		// responseEntity
-		// }
+		
 		return body;
 	}
 
 	public ResponseEntity<String> getV1(String uri) throws URISyntaxException, MalformedURLException {
+		RestTemplateUtil.getJwttokenFromHeaders(headers);
 		HttpEntity<String> requestEntity = new HttpEntity<String>("", headers);
 		ResponseEntity<String> responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class);
 		return responseEntity;
@@ -107,6 +94,7 @@ public String get(String uri, HashMap<String, Object> header) {
 		} else {
 			headers.add("Content-Type", MediaType.APPLICATION_JSON);
 		}
+		RestTemplateUtil.getJwttokenFromHeaders(headers);
 		HttpEntity<String> requestEntity = new HttpEntity<String>("", headers);
 		ResponseEntity<String> responseEntity = rest.exchange(uri, HttpMethod.GET, requestEntity, String.class);
 		setStatus((HttpStatus) responseEntity.getStatusCode());
@@ -116,6 +104,7 @@ public String get(String uri, HashMap<String, Object> header) {
 
 	public String post(String uri, String json) {
 		String body;
+		RestTemplateUtil.getJwttokenFromHeaders(headers);
 		HttpEntity<String> requestEntity = new HttpEntity<String>(json, headers);
 		ResponseEntity<String> responseEntity = rest.exchange(uri, HttpMethod.POST, requestEntity, String.class);
 		setStatus((HttpStatus) responseEntity.getStatusCode());
@@ -129,9 +118,7 @@ public String post(String uri, String data, HashMap<String, Object> header) {
 		if (header.containsKey(headers.AUTHORIZATION)) {
 			headers.add(headers.AUTHORIZATION, header.get(headers.AUTHORIZATION).toString());
 		}
-
-		// headers.add("Content-Type", MediaType.APPLICATION_JSON);
-
+		RestTemplateUtil.getJwttokenFromHeaders(headers);
 		headers.add("Content-Type", MediaType.APPLICATION_JSON + ";charset=utf-8");
 		ResponseEntity<String> responseEntity = new ResponseEntity(HttpStatus.BAD_REQUEST);
 		HttpEntity<String> requestEntity;