diff --git a/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java b/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java
index e3ae01ad..25a41de6 100644
--- a/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java
+++ b/src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java
@@ -45,6 +45,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
@@ -113,7 +114,10 @@ public class EmployeeMasterServiceImpl implements EmployeeMasterInter {
 
 	private static HttpUtils httpUtils = new HttpUtils();
 
-	private String common_url = ConfigProperties.getPropertyByName("common-url");
+	@Value("${common-url}")
+	private String common_url;
+
+	// private String common_url = ConfigProperties.getPropertyByName("common-url");
 
 	private final String COMMON_BASE_URL = "common-url";
 
@@ -470,7 +474,7 @@ private Set<String> getCTICampaignRoles(String campaignName, String authToken) t
 		ObjectMapper objectMapper = new ObjectMapper();
 		Set<String> resultSet = new HashSet<String>();
 		HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(campaignName, authToken);
-		String url = configProperties.getPropertyByName("common-url")  + configProperties.getPropertyByName("create-feedback");
+		String url = common_url +"/"  + configProperties.getPropertyByName("create-feedback");
 		
 		ResponseEntity<String> responseStr = restTemplate.exchange(url, HttpMethod.POST, request, String.class);
 		OutputResponse response = objectMapper.readValue(responseStr.getBody(), OutputResponse.class);
@@ -713,7 +717,8 @@ public void createUserInCallCentre(M_User1 user, String authToken) {
 		logger.info("EmployeeMasterServiceImpl.createUserInCallCentre - start");
 		if (ENABLE_CTI_USER_CREATION) {
 			String UserCreateAPIURL = "";
-			String ctiServer = configProperties.getPropertyByName("common-url");
+			// String ctiServer = configProperties.getPropertyByName("common-url");
+			String ctiServer=common_url;
 			UserCreateAPIURL = ctiServer + configProperties.getPropertyByName("create-update-users-url");
 			HashMap<String, Object> headers = new HashMap<String, Object>();
 			JSONObject request = new JSONObject();
@@ -747,7 +752,8 @@ public void updateUserInCallCentre(String userName, String ctiRole, String authT
 
 		if (ENABLE_CTI_USER_CREATION) {
 			String UserCreateAPIURL = "";
-			String ctiServer = configProperties.getPropertyByName("common-url");
+			// String ctiServer = configProperties.getPropertyByName("common-url");
+			String ctiServer=common_url;
 			UserCreateAPIURL = ctiServer + configProperties.getPropertyByName("create-update-users-url");
 			HashMap<String, Object> headers = new HashMap<String, Object>();
 			JSONObject request = new JSONObject();
diff --git a/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java b/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java
index 009842c4..19ef7496 100644
--- a/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java
+++ b/src/main/java/com/iemr/admin/service/provideronboard/EncryptUserPassword123.java
@@ -24,6 +24,7 @@
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -34,15 +35,31 @@
 import com.iemr.admin.utils.mapper.InputMapper;
 import com.iemr.admin.utils.response.OutputResponse;
 
+import jakarta.annotation.PostConstruct;
+
 @Service
 public class EncryptUserPassword123 {
 	private static HttpUtils utils = new HttpUtils();
-	private static String commonBaseURL = ConfigProperties.getPropertyByName("common-url");
-	private static String encryptPasswordURL = commonBaseURL
-			+ ConfigProperties.getPropertyByName("encrypt-password-url");
+	// private static String commonBaseURL =
+	// ConfigProperties.getPropertyByName("common-url");
+
+	@Value("${common-url}")
+	private String commonBaseURL;
+
+	// private String encryptPasswordURL = commonBaseURL + "/"
+	// + ConfigProperties.getPropertyByName("encrypt-password-url");
 
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
+	private String encryptPasswordURL;
+
+	@PostConstruct
+	public void init() {
+		encryptPasswordURL = commonBaseURL + "/" +
+				ConfigProperties.getPropertyByName("encrypt-password-url");
+		logger.info("commonBaseURL=" + encryptPasswordURL);
+	}
+
 	@Async
 	public OutputResponse encryptUserCredentials(M_User data) {
 		JSONObject request = new JSONObject();
diff --git a/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java b/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java
index 14ff8cb9..165120e1 100644
--- a/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java
+++ b/src/main/java/com/iemr/admin/service/user/EncryptUserPassword.java
@@ -24,6 +24,7 @@
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -33,15 +34,34 @@
 import com.iemr.admin.utils.mapper.InputMapper;
 import com.iemr.admin.utils.response.OutputResponse;
 
+import jakarta.annotation.PostConstruct;
+
 @Service
 public class EncryptUserPassword {
 	private static HttpUtils utils = new HttpUtils();
-	private static String commonBaseURL = ConfigProperties.getPropertyByName("common-url");
-	private static String encryptPasswordURL = commonBaseURL
-			+ ConfigProperties.getPropertyByName("encrypt-password-url");
+
+	@Value("${common-url}")
+	private String commonBaseURL;
+
+	// @Value("${encrypt-password-url}")
+	// private String encryptPasswordEndpoint;
+
+	// private static String commonBaseURL =
+	// ConfigProperties.getPropertyByName("common-url");
+	// private String encryptPasswordURL = commonBaseURL + "/" +
+	// ConfigProperties.getPropertyByName("encrypt-password-url");
 
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
+	private String encryptPasswordURL;
+
+	@PostConstruct
+	public void init() {
+		encryptPasswordURL = commonBaseURL + "/" +
+				ConfigProperties.getPropertyByName("encrypt-password-url");
+		logger.info("commonBaseURL" + encryptPasswordURL);
+	}
+
 	@Async
 	public OutputResponse encryptUserCredentials(M_User1 data) {
 		JSONObject request = new JSONObject();
diff --git a/src/main/java/com/iemr/admin/utils/config/ConfigProperties.java b/src/main/java/com/iemr/admin/utils/config/ConfigProperties.java
index 2aacef90..9fdb90fe 100644
--- a/src/main/java/com/iemr/admin/utils/config/ConfigProperties.java
+++ b/src/main/java/com/iemr/admin/utils/config/ConfigProperties.java
@@ -118,11 +118,27 @@ public static int getSessionExpiryTime() {
 	public static String getPropertyByName(String propertyName) {
 		String result = null;
 		try {
-			if (properties == null) {
-				initalizeProperties();
+			// if (properties == null) {
+			// 	initalizeProperties();
+			// }
+			// // result = environment.getProperty(propertyName);
+			// result = properties.getProperty(propertyName);
+
+			if (environment != null)
+			{
+				result = environment.getProperty(propertyName);
+			}
+			if (result == null)
+			{
+				if (properties == null)
+				{
+					initalizeProperties();
+				}
+				result = properties.getProperty(propertyName).trim();
+			} else
+			{
+				result = result.trim();
 			}
-			// result = environment.getProperty(propertyName);
-			result = properties.getProperty(propertyName);
 		} catch (Exception e) {
 			logger.error(propertyName + " retrival failed.", e);
 		}