diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
index 709c5156..cc974456 100644
--- a/src/main/environment/common_ci.properties
+++ b/src/main/environment/common_ci.properties
@@ -157,3 +157,5 @@ grievancePassword = @env.GRIEVANCE_PASSWORD@
 grievanceUserAuthenticate = @env.GRIEVANCE_USER_AUTHENTICATE@
 grievanceDataSyncDuration = @env.GRIEVANCE_DATA_SYNC_DURATION@
 
+springdoc.api-docs.enabled=false
+springdoc.swagger-ui.enabled=false
diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties
index 2331c878..411543dd 100644
--- a/src/main/environment/common_dev.properties
+++ b/src/main/environment/common_dev.properties
@@ -182,3 +182,6 @@ grievancePassword = <Enter Grievance password>
 
 grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
 grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
+
+springdoc.api-docs.enabled=true
+springdoc.swagger-ui.enabled=true
\ No newline at end of file
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
index c72d4d41..410fc967 100644
--- a/src/main/environment/common_example.properties
+++ b/src/main/environment/common_example.properties
@@ -128,3 +128,6 @@ grievancePassword = <Enter Grievance password>
 grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
 grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
 
+springdoc.api-docs.enabled=true
+springdoc.swagger-ui.enabled=true
+
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
index f9248624..30531c1b 100644
--- a/src/main/environment/common_test.properties
+++ b/src/main/environment/common_test.properties
@@ -184,3 +184,6 @@ grievancePassword = <Enter Grievance password>
 
 grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
 grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
+
+springdoc.api-docs.enabled=true
+springdoc.swagger-ui.enabled=true
\ No newline at end of file
diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties
index a6702938..f818921f 100644
--- a/src/main/environment/common_uat.properties
+++ b/src/main/environment/common_uat.properties
@@ -155,3 +155,6 @@ grievancePassword = <Enter Grievance password>
 
 grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
 grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
+
+springdoc.api-docs.enabled=true
+springdoc.swagger-ui.enabled=true
\ No newline at end of file
diff --git a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java
index 0c0aaac7..c05436e1 100644
--- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java
+++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java
@@ -152,8 +152,9 @@ public String userAuthenticate(
 			JSONObject serviceRoleMap = new JSONObject();
 			JSONArray serviceRoleList = new JSONArray();
 			JSONObject previlegeObj = new JSONObject();
-			if (m_User.getUserName() != null && (m_User.getDoLogout() == null || m_User.getDoLogout() == false)
-					&& (m_User.getWithCredentials() != null || m_User.getWithCredentials() == true)) {
+			if (m_User.getUserName() != null 
+					    && (m_User.getDoLogout() == null || !m_User.getDoLogout()) 
+					    && (m_User.getWithCredentials() != null && m_User.getWithCredentials())) {
 				String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser(
 						m_User.getUserName().trim().toLowerCase());
 				if (tokenFromRedis != null) {
diff --git a/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java b/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java
index 7038cdb7..a31b2a2b 100644
--- a/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java
+++ b/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java
@@ -88,9 +88,15 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 				case "userLogout":
 				case "swagger-ui.html":
 				case "index.html":
+				case "index.css":
 				case "swagger-initializer.js":
 				case "swagger-config":
+				case "swagger-ui-bundle.js":
+				case "swagger-ui.css":
 				case "ui":
+				case "swagger-ui-standalone-preset.js":
+				case "favicon-32x32.png":
+				case "favicon-16x16.png":
 				case "swagger-resources":
 				case "api-docs":
 				case "updateBenCallIdsInPhoneBlock":