diff --git a/CHANGELOG.md b/CHANGELOG.md
index d283b52..b6f9363 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,9 @@
 
 ## [v1.3.0-SNAPSHOT]  - 20240-03-22
 Token exchange (#27099)
+Client-exchange configuration for a dedicated client (#27204)
 
-## [v1..0] - 2023-03-20
+## [v1.2.0] - 2023-03-20
 
 - Decode Button
 - Updatet layout
diff --git a/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java b/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java
index 3bd2351..04913b8 100644
--- a/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java
+++ b/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java
@@ -31,6 +31,7 @@ import com.liferay.portal.kernel.json.JSONFactoryUtil;
 import com.liferay.portal.kernel.json.JSONObject;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.ParamUtil;
+import com.liferay.portal.kernel.util.PrefsPropsUtil;
 import com.liferay.portal.model.User;
 import com.liferay.portal.util.PortalUtil;
 import com.liferay.util.bridges.mvc.MVCPortlet;
@@ -122,19 +123,24 @@ public class RPTTokenReader extends MVCPortlet {
 
 			// URL auth_url = configuration.getTokenURL();
 			// log.info("auth_url " + auth_url);
-			log.info("authToken '" + authToken.getAccessTokenString() + "'");
+			// log.info("authToken '" + authToken.getAccessTokenString() + "'");
 			// log.info("umaToken " + umaToken.getAccessTokenString());
 			// log.info("context " + context);
 			// log.info("encoded_context " + urlEncodedContext);
 			// log.info("client_id " + configuration.getPortalClientId());
 			// log.info("client_secret " + configuration.getPortalClientSecret());
 
+			Long companyId = PortalUtil.getCompanyId(httpReq);
+
+			String exchangeClientId = PrefsPropsUtil.getString(companyId, "d4science.oidc-token-exchange-dedicated-client-id");
+            String exchangeClientSecret = PrefsPropsUtil.getString(companyId, "d4science.oidc-token-exchange-dedicated-client-secret");
+        
 			exchangedToken = OpenIdConnectRESTHelperExtended.ExtendedQueryExchangeToken(
 					configuration.getTokenURL(),
 					authToken.getAccessTokenString(),
 					urlEncodedContext,
-					configuration.getPortalClientId(),
-					configuration.getPortalClientSecret(),
+					exchangeClientId,
+					exchangeClientSecret,
 					null
 			);