diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts
index fe46d51f..ec6a9ef4 100644
--- a/explore/src/app/app.component.ts
+++ b/explore/src/app/app.component.ts
@@ -41,8 +41,7 @@ export class AppComponent {
    clientLoad = 0;
 
    userMenuItems:MenuItem[] =  [ new MenuItem("","My profile","","",false,[],[],{}),
-  new MenuItem("","My links","","/myclaims",false,[],["/myclaims"],{}),
-  new MenuItem("","Manage all links","","/claims",true,[],["/claims"],{})]
+  new MenuItem("","My links","","/myclaims",false,[],["/myclaims"],{})]
 
 
   menuItems:RootMenuItem [] = [
@@ -97,8 +96,13 @@ export class AppComponent {
                  this.properties = this.propertiesService.envSpecific;
                  this.feedbackmail = this.properties.feedbackmail;
                  if(Session.isPortalAdministrator()){
+                   this.userMenuItems.push(new MenuItem("","Manage all links","","/claims",false,[],["/claims"],{}));
                    this.userMenuItems.push(new MenuItem("","Manage helptexts",
                    ((this.properties.environment == "beta")?"https://beta.admin.connect.openaire.eu":"https://admin.explore.openaire.eu")+"/dashboard?communityId=openaire","",true,[],[],{}))
+
+                 }else if(Session.isClaimsCurator()){
+                    this.userMenuItems.push(new MenuItem("","Manage all links","","/claims",false,[],["/claims"],{}));
+
                  }
                  //console.log(this.properties.loginUrl);
              }, error => {
diff --git a/explore/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts b/explore/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts
index c7895353..ad438da3 100644
--- a/explore/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts
+++ b/explore/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
-import{  AdminLoginGuard} from '../../openaireLibrary/login/adminLoginGuard.guard';
+import{  ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
 
@@ -9,7 +9,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
 @NgModule({
   imports: [
     RouterModule.forChild([
-      { path: '', component: OpenaireClaimsAdminComponent, canActivate: [IsRouteEnabled, AdminLoginGuard],
+      { path: '', component: OpenaireClaimsAdminComponent, canActivate: [IsRouteEnabled, ClaimsCuratorGuard],
       data: {redirect: '/error',  community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
   ]
 })
diff --git a/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts b/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts
index d4a4380b..e203267c 100644
--- a/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts
+++ b/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts
@@ -4,7 +4,7 @@ import { SharedModule } from '../../shared/shared.module';
 import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
 import { ClaimsAdminRoutingModule } from './claimsAdmin-routing.module';
 import{ClaimsAdminModule } from '../../openaireLibrary/claims/claimsAdmin/claimsAdmin.module';
-import {AdminLoginGuard} from '../../openaireLibrary/login/adminLoginGuard.guard';
+import{  ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
 
@@ -15,7 +15,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
     ClaimsAdminRoutingModule,
     ClaimsAdminModule
   ],
-    providers:[AdminLoginGuard, PreviousRouteRecorder,IsRouteEnabled],
+    providers:[ClaimsCuratorGuard, PreviousRouteRecorder,IsRouteEnabled],
   declarations: [
     OpenaireClaimsAdminComponent
   ]
diff --git a/explore/src/assets/env-properties.json b/explore/src/assets/env-properties.json
index a729dbff..03295980 100644
--- a/explore/src/assets/env-properties.json
+++ b/explore/src/assets/env-properties.json
@@ -7,7 +7,7 @@
   "framesAPIURL" : "https://beta.openaire.eu/stats3/",
   "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/",
   "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
-  "claimsAPIURL" : "http://duffy.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
+  "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
   "searchAPIURLLAst"     : "https://beta.services.openaire.eu/search/v2/api/",
   "searchResourcesAPIURL"     : "https://beta.services.openaire.eu/search/v2/api/resources",
   "openCitationsAPIURL" : "https://services.openaire.eu/opencitations/getCitations?id=",