diff --git a/gms-client/gms-cli/src/main/java/it/inaf/ia2/gms/cli/CLI.java b/gms-client/gms-cli/src/main/java/it/inaf/ia2/gms/cli/CLI.java
index 71b413bee175693c0df3ccc602667e6106a26f5b..87fa8beea3808eafcdd95f146bc699f4acfd502d 100644
--- a/gms-client/gms-cli/src/main/java/it/inaf/ia2/gms/cli/CLI.java
+++ b/gms-client/gms-cli/src/main/java/it/inaf/ia2/gms/cli/CLI.java
@@ -3,6 +3,7 @@ package it.inaf.ia2.gms.cli;
 import it.inaf.ia2.client.ClientException;
 import it.inaf.ia2.gms.client.GmsClient;
 import it.inaf.ia2.gms.client.model.Permission;
+import it.inaf.ia2.rap.client.ClientCredentialsRapClient;
 import it.inaf.ia2.rap.client.RapClient;
 import it.inaf.ia2.rap.data.AccessTokenResponse;
 import java.io.File;
@@ -108,7 +109,7 @@ public class CLI {
         if (token != null) {
             client.setAccessToken(token);
         } else {
-            RapClient rapClient = new RapClient(rapBaseUrl)
+            RapClient rapClient = new ClientCredentialsRapClient(rapBaseUrl)
                     .setClientId(clientId)
                     .setClientSecret(clientSecret);
             AccessTokenResponse accessTokenResponse = rapClient.getAccessTokenFromClientCredentials();