diff --git a/lib/core/services/authentication.service.ts b/lib/core/services/authentication.service.ts
index 34cfdfe881..4bf9ff5be1 100644
--- a/lib/core/services/authentication.service.ts
+++ b/lib/core/services/authentication.service.ts
@@ -50,7 +50,10 @@ export class AuthenticationService {
      * @returns True if logged in, false otherwise
      */
     isLoggedIn(): boolean {
-        return !!this.alfrescoApi.getInstance().isLoggedIn();
+            if (!this.isOauth() && this.cookie.isEnabled() && !this.isRememberMeSet()) {
+                return false;
+            }
+            return this.alfrescoApi.getInstance().isLoggedIn();
     }
 
     isOauth(): boolean {
diff --git a/lib/core/services/cookie.service.ts b/lib/core/services/cookie.service.ts
index 474f0da98d..dff0ebe114 100644
--- a/lib/core/services/cookie.service.ts
+++ b/lib/core/services/cookie.service.ts
@@ -31,7 +31,7 @@ export class CookieService {
         }
 
         document.cookie = 'test-cookie';
-        return document.cookie.indexOf('test-cookie') > 0;
+        return document.cookie.indexOf('test-cookie') >= 0;
     }
 
     /**