diff --git a/login/utils/helper.class.ts b/login/utils/helper.class.ts
index cbbed24d..7cdb3cd8 100644
--- a/login/utils/helper.class.ts
+++ b/login/utils/helper.class.ts
@@ -1,5 +1,5 @@
 import {StringUtils} from '../../utils/string-utils.class';
- 
+
 export class User {
     email:string;
     firstname: string;
@@ -38,10 +38,9 @@ export class Session{
       var user:User = null;
       var cookie= COOKIE.getCookie(COOKIE.cookieName_u);
     if( typeof localStorage !== 'undefined') {
-        if(localStorage.getItem("user") && (cookie != null && cookie != "")) {
+        if(localStorage.getItem("user") || (cookie != null && cookie != "")) {
           user = JSON.parse(localStorage.getItem("user"));
             if(user && (user.fullname != null || user.lastname !=null || user.firstname !=null)){
-
               loggedIn = true;
             }else if(cookie != null && this.getUserFromCookie()!= null){
                loggedIn = true
@@ -111,15 +110,11 @@ export class Session{
   public static getCurrentParameters():any {
     if( typeof localStorage !== 'undefined') {
       var params = localStorage.getItem("params");
-      console.log(params);
       var object = null;
       if(params.split("&").length > 0){
         object = {};
       }
       for(var i=0; i<params.split("&").length; i++){
-        console.log(params.split("&")[i]);
-        console.log((params.split("&")[i]).split("=")[0]);
-        console.log((params.split("&")[i]).split("=")[1]);
         object[(params.split("&")[i]).split("=")[0]] = (params.split("&")[i]).split("=")[1];
       }
       return object;
@@ -269,6 +264,12 @@ export  class MyJWT{
       d.setTime(d.getTime() + expireDays * 24 * 60 * 60 * 1000);
       let expires:string = `expires=${d.toUTCString()}`;
       // let cpath:string = path ? `; path=${path}` : '';
-      document.cookie = name+'='+value+'; path='+path+'; domain='+document.domain+';';
+      let domain = "";
+      if(document.domain.indexOf(".di.uoa.gr")!= -1){
+        domain = ".di.uoa.gr";
+      }else if(document.domain.indexOf(".openaire.eu") != -1){
+        domain = ".openaire.eu";
+      }
+      document.cookie = name+'='+value+'; path='+path+'; domain='+domain+';';
   }
 }