diff --git a/src/main/java/com/eactive/eai/authserver/config/CustomOAuth2AuthenticationEntryPoint.java b/src/main/java/com/eactive/eai/authserver/config/CustomOAuth2AuthenticationEntryPoint.java
index cdf46ba..892d4a5 100644
--- a/src/main/java/com/eactive/eai/authserver/config/CustomOAuth2AuthenticationEntryPoint.java
+++ b/src/main/java/com/eactive/eai/authserver/config/CustomOAuth2AuthenticationEntryPoint.java
@@ -82,10 +82,7 @@ public class CustomOAuth2AuthenticationEntryPoint extends OAuth2AuthenticationEn
     
     private void logTokenIssuance(boolean isSuccess, boolean isRestrictionExempt, String resultMessage, String accessToken) {
 		try {
-			if (!EAIDBLogControl.isEnable()) {
-				logger.warn("DB logging is disabled. Skipping token issuance logging.");
-				return;
-			}
+
 			RequestContextData data = RequestContextData.ThreadLocalRequestContext.get();
 			OAuth2Manager.getInstance();
 
@@ -109,8 +106,15 @@ public class CustomOAuth2AuthenticationEntryPoint extends OAuth2AuthenticationEn
 			log.setResultMessage(resultMessage);
 			log.setAccessToken(accessToken); // Add access token value to the log
 			
-			logger.info("Token request[/oauth/token or /oauth2/token] => clientId: {}, grantType: {}, scope: {}", 
-		            clientId, data.getGrantType(), data.getScope());
+			if( !isSuccess ) {
+				logger.error("Token request[/oauth/token or /oauth2/token] => clientId: {}, grantType: {}, scope: {}",
+						clientId, data.getGrantType(), data.getScope());
+			}
+			
+			if (!EAIDBLogControl.isEnable()) {
+				logger.warn("DB logging is disabled. Skipping token issuance logging.");
+				return;
+			}
 
 			tokenIssuanceLogDAO.saveTokenIssuanceLog(log);
 		} catch (Throwable th) {
diff --git a/src/main/java/com/eactive/eai/authserver/config/CustomTokenEndpointExceptionResolver.java b/src/main/java/com/eactive/eai/authserver/config/CustomTokenEndpointExceptionResolver.java
index 0931078..438dc02 100644
--- a/src/main/java/com/eactive/eai/authserver/config/CustomTokenEndpointExceptionResolver.java
+++ b/src/main/java/com/eactive/eai/authserver/config/CustomTokenEndpointExceptionResolver.java
@@ -93,10 +93,6 @@ public class CustomTokenEndpointExceptionResolver implements HandlerExceptionRes
 	private void logTokenIssuance(boolean isSuccess, boolean isRestrictionExempt, String resultMessage,
 			String accessToken) {
 		try {
-			if (!EAIDBLogControl.isEnable()) {
-				logger.warn("DB logging is disabled. Skipping token issuance logging.");
-				return;
-			}
 			RequestContextData data = RequestContextData.ThreadLocalRequestContext.get();
 			OAuth2Manager.getInstance();
 
@@ -119,10 +115,17 @@ public class CustomTokenEndpointExceptionResolver implements HandlerExceptionRes
 			log.setRestrictionExemptYn(isRestrictionExempt ? "Y" : "N");
 			log.setResultMessage(resultMessage);
 			log.setAccessToken(accessToken); // Add access token value to the log
-
-			logger.info("Token request[/oauth/token or /oauth2/token] => clientId: {}, grantType: {}, scope: {}",
-					clientId, data.getGrantType(), data.getScope());
-
+			
+			if( !isSuccess ) {
+				logger.error("Token request[/oauth/token or /oauth2/token] => clientId: {}, grantType: {}, scope: {}",
+						clientId, data.getGrantType(), data.getScope());
+			}
+			
+			if (!EAIDBLogControl.isEnable()) {
+				logger.warn("DB logging is disabled. Skipping token issuance logging.");
+				return;
+			}
+			
 			tokenIssuanceLogDAO.saveTokenIssuanceLog(log);
 		} catch (Throwable th) {
 			logger.error("Error while logging token issuance: " + th.getMessage(), th);