diff --git a/src/main/java/com/iemr/mmu/utils/Constants.java b/src/main/java/com/iemr/mmu/utils/Constants.java
new file mode 100644
index 00000000..d847d7cc
--- /dev/null
+++ b/src/main/java/com/iemr/mmu/utils/Constants.java
@@ -0,0 +1,10 @@
+package com.iemr.mmu.utils;
+
+public class Constants {
+	public static final String JWT_TOKEN = "Jwttoken";
+	public static final String USER_AGENT = "User-Agent";
+	public static final String OKHTTP = "okhttp";
+	
+	private Constants() {}
+	
+}
diff --git a/src/main/java/com/iemr/mmu/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/mmu/utils/JwtUserIdValidationFilter.java
index b12307ff..8f630cf2 100644
--- a/src/main/java/com/iemr/mmu/utils/JwtUserIdValidationFilter.java
+++ b/src/main/java/com/iemr/mmu/utils/JwtUserIdValidationFilter.java
@@ -51,7 +51,6 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
 		}
 
 		// Log headers for debugging
-		String jwtTokenFromHeader = request.getHeader("Jwttoken");
 		logger.info("JWT token from header: ");
 
 		// Skip login and public endpoints
@@ -68,7 +67,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
 
 		try {
 			String jwtFromCookie = getJwtTokenFromCookies(request);
-			String jwtFromHeader = request.getHeader("JwtToken");
+			String jwtFromHeader = request.getHeader(Constants.JWT_TOKEN);
 			String authHeader = request.getHeader("Authorization");
 
 			if (jwtFromCookie != null) {
@@ -88,7 +87,8 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
 					return;
 				}
 			} else {
-				String userAgent = request.getHeader("User-Agent");
+				String userAgent = request.getHeader(Constants.USER_AGENT);
+
 				logger.info("User-Agent: " + userAgent);
 				if (userAgent != null && isMobileClient(userAgent) && authHeader != null) {
 					try {
@@ -112,13 +112,13 @@ private boolean isMobileClient(String userAgent) {
 		if (userAgent == null)
 			return false;
 		userAgent = userAgent.toLowerCase();
-		return userAgent.contains("okhttp"); // iOS (custom clients)
+		return userAgent.contains(Constants.OKHTTP); // iOS (custom clients)
 	}
 	private String getJwtTokenFromCookies(HttpServletRequest request) {
 		Cookie[] cookies = request.getCookies();
 		if (cookies != null) {
 			for (Cookie cookie : cookies) {
-				if (cookie.getName().equals("Jwttoken")) {
+				if (cookie.getName().equalsIgnoreCase(Constants.JWT_TOKEN)) {
 					return cookie.getValue();
 				}
 			}
diff --git a/src/main/java/com/iemr/mmu/utils/RestTemplateUtil.java b/src/main/java/com/iemr/mmu/utils/RestTemplateUtil.java
index 6e048869..18e1037e 100644
--- a/src/main/java/com/iemr/mmu/utils/RestTemplateUtil.java
+++ b/src/main/java/com/iemr/mmu/utils/RestTemplateUtil.java
@@ -39,7 +39,8 @@ public static HttpEntity<Object> createRequestEntity(Object body, String authori
         	headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent());
         }
         headers.add(HttpHeaders.AUTHORIZATION, authorization);
-        headers.add("JwtToken",requestHeader.getHeader("JwtToken"));
+        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);
         }