diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/utils/UserUtils.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/utils/UserUtils.java
index 575ff6d..f8c1996 100644
--- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/utils/UserUtils.java
+++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/utils/UserUtils.java
@@ -28,15 +28,13 @@ public class UserUtils {
 
 		ClientInfo client = null;
 		try{
-			AuthorizationProvider.instance.get().getClient();
+			client = AuthorizationProvider.instance.get().getClient();
 		}catch(Throwable  e) {
 			log.warn("Unable to get client info ",e);
 		}
 
-		//TODO Actually get ROLES
-		Set<String> roles = new HashSet<>();
 		AuthenticatedUser toReturn =
-				new AuthenticatedUser(client,roles, AccessTokenProvider.instance.get(),SecurityTokenProvider.instance.get(),context);
+				new AuthenticatedUser(client,new HashSet<>(client.getRoles()), AccessTokenProvider.instance.get(),SecurityTokenProvider.instance.get(),context);
 
 		log.info("Current User is {} ",toReturn);
 		return toReturn;