diff --git a/claims/claimsAdmin/claimsAdmin.component.ts b/claims/claimsAdmin/claimsAdmin.component.ts
index d061f70b..0022bef8 100644
--- a/claims/claimsAdmin/claimsAdmin.component.ts
+++ b/claims/claimsAdmin/claimsAdmin.component.ts
@@ -19,7 +19,7 @@ import {Observable}                   from 'rxjs/Observable';
             <div>
               <div class="uk-text-right">
               <a  *ngIf="!fetchBy || fetchBy != 'Context'" routerLink="/participate/claim">Claim more links?</a>
-              <a  *ngIf="isConnect && fetchBy && fetchBy == 'Context' && fetchId" [href]="'https://beta.'+fetchId+'.openaire.eu/participate/claim'"  target="_blank">Add more Links?</a>
+              <a  *ngIf="isConnect && fetchBy && fetchBy == 'Context' && fetchId" [href]="'https://beta.'+fetchId+'.openaire.eu/participate/claim'"  target="_blank">Claim more links?</a>
               </div>
               <displayClaims [enableDelete]=true [myClaims]=false [isAdmin]=true [fetchBy]= fetchBy [fetchId]=fetchId
               [communityId]="(fetchBy && fetchBy == 'Context')?fetchId:null"></displayClaims>
diff --git a/login/utils/helper.class.ts b/login/utils/helper.class.ts
index b76dc489..320ba6e7 100644
--- a/login/utils/helper.class.ts
+++ b/login/utils/helper.class.ts
@@ -16,7 +16,7 @@ export class Session{
   public static removeUser() {
     COOKIE.deleteCookie(COOKIE.cookieName_id)
     COOKIE.deleteCookie(COOKIE.cookieName_u);
-    COOKIE.deleteCookie("SESSION");
+    COOKIE.deleteCookie("openAIRESession");
 
   }
   public static getUser():User {
@@ -55,7 +55,8 @@ export class Session{
       var dataStr:string = data.substr(1,data.length-2).replace(/\\/g,"");
       var info = JSON.parse(dataStr);
       var user: User = new User();
-      user.id = (info.sub && info.sub.indexOf('@'))?info.sub.substring(0,info.sub.indexOf('@')):info.sub;
+      var sub = (info.sub)?StringUtils.URIDecode(info.sub):"";
+      user.id = (sub && sub.indexOf('@'))?sub.substring(0,sub.indexOf('@')):sub;
 
       user.firstname = (StringUtils.URIDecode((info.firstname && info.firstname!="")?info.firstname:"")).replace("+"," ");
       user.lastname = (StringUtils.URIDecode((info.lastname && info.lastname!="")?info.lastname:"")).replace("+"," ");