diff --git a/dmp-frontend/src/app/app.component.html b/dmp-frontend/src/app/app.component.html
index 5455350f2..619855ccb 100644
--- a/dmp-frontend/src/app/app.component.html
+++ b/dmp-frontend/src/app/app.component.html
@@ -8,7 +8,7 @@
       </button>
     -->
       <div class="nav navbar-nav navbar-left">
-        <div class="dropdown ">
+        <div class="dropdown" [ngClass]="{false:'invisible'}[tokenService.isLoggedIn() == true]">
             <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"> Manage <span class="caret"></span> </button>
             <ul class="dropdown-menu">
               <li><a class="cursor" (click)="goToDMPs()">My DMPs</a></li>
diff --git a/dmp-frontend/src/app/services/login/token.service.ts b/dmp-frontend/src/app/services/login/token.service.ts
index 8a503c4a2..9d4fc5612 100644
--- a/dmp-frontend/src/app/services/login/token.service.ts
+++ b/dmp-frontend/src/app/services/login/token.service.ts
@@ -1,6 +1,7 @@
 import { Injectable, Inject} from '@angular/core';
 import { Observable } from 'rxjs';
 import {LocalStorageService} from 'ngx-webstorage';
+import {Router} from '@angular/router';
 import 'rxjs/add/operator/map';
 import { DOCUMENT } from '@angular/platform-browser';
 
@@ -13,7 +14,7 @@ declare function sign_out_google(): any;
 @Injectable()
 export class TokenService {
 
-  constructor (private storage : LocalStorageService, @Inject(DOCUMENT) private document) {
+  constructor (private storage : LocalStorageService, @Inject(DOCUMENT) private document, private router : Router) {
     //var csrfToken : string = jQuery(document).find('meta[name="csrf-token"]').attr('content');
     //this.setCSRFToken(csrfToken);
   }
@@ -96,7 +97,9 @@ export class TokenService {
 
     this.setProvider(null);
     
-    window.location.reload();
+    this.router.navigate(['/login'], { queryParams: { /*returnUrl: this.state.url*/ }});
+
+    //window.location.reload();
   }