diff --git a/login/utils/helper.class.ts b/login/utils/helper.class.ts
index 2bc55406..037d555f 100644
--- a/login/utils/helper.class.ts
+++ b/login/utils/helper.class.ts
@@ -132,7 +132,8 @@ export class Session{
   public static isClaimsCurator():boolean {
       var isAuthorized = false;
       if(Session.isLoggedIn()){
-        var claimRoles = ["urn:mace:openminted.eu:aai.openminted.eu:group:OpenAIRE+Curator+-+Claim"]
+
+        var claimRoles = ["urn:geant:openaire.eu:group:Curator+-+Claim#aai.openaire.eu"]
         for (var i = 0; i < claimRoles.length; i++) {
             if ((Session.getUser().role).indexOf(claimRoles[i]) > -1) {
                 isAuthorized = true;
@@ -146,7 +147,7 @@ export class Session{
   public static isCommunityCurator():boolean {
       var isAuthorized = false;
       if(Session.isLoggedIn()){
-        var roles = ["urn:mace:openminted.eu:aai.openminted.eu:group:OpenAIRE+Curator+-+Community"]
+        var roles = ["urn:geant:openaire.eu:group:Curator+-+Community#aai.openaire.eu"]
         for (var i = 0; i < roles.length; i++) {
             if ((Session.getUser().role).indexOf(roles[i]) > -1) {
                 isAuthorized = true;
@@ -160,7 +161,7 @@ export class Session{
   public static isPortalAdministrator():boolean {
       var isAuthorized = false;
       if(Session.isLoggedIn()){
-        var roles = ["urn:mace:openminted.eu:aai.openminted.eu:group:OpenAIRE+Portal+Administrator"]
+        var roles = ["urn:geant:openaire.eu:group:Portal+Administrator#aai.openaire.eu"]
         for (var i = 0; i < roles.length; i++) {
             if ((Session.getUser().role).indexOf(roles[i]) > -1) {
                 isAuthorized = true;
@@ -176,7 +177,7 @@ export class Session{
   public static isRegisteredUser():boolean {
       var isRegisteredUser = false;
       if(Session.isLoggedIn()){
-        var claimRoles = ["urn:mace:openminted.eu:aai.openminted.eu:group:Registered+User"];
+        var claimRoles = ["urn:geant:openaire.eu:group:Registered+User#aai.openaire.eu"];
         for (var i = 0; i < claimRoles.length; i++) {
             if ((Session.getUser().role).indexOf(claimRoles[i]) > -1) {
                 isRegisteredUser = true;