diff --git a/overlord/src/app/core/nav-bar/nav-bar.component.html b/overlord/src/app/core/nav-bar/nav-bar.component.html
index baf2fc8d..0dcf77c3 100644
--- a/overlord/src/app/core/nav-bar/nav-bar.component.html
+++ b/overlord/src/app/core/nav-bar/nav-bar.component.html
@@ -64,18 +64,18 @@
   <span class="fill-remaining-space"></span>
 
   <mat-menu #userMenu="matMenu">
-    <a mat-menu-item routerLink="/logout">Logout {{nameObject | async}}</a>
-    <a mat-menu-item routerLink="/users/{{nameObject | async}}">Change Password</a>
+    <a mat-menu-item (click)="logout()">Logout {{(auth.currentUser | async)?.name}}</a>
+    <a mat-menu-item routerLink="/users/me">Change Password</a>
     <a mat-menu-item routerLink="/users">Users</a>
     <a mat-menu-item routerLink="/groups">Groups</a>
     <a mat-menu-item routerLink="/clients">Clients</a>
     <a mat-menu-item routerLink="/settings">Settings</a>
   </mat-menu>
-  <button mat-button [matMenuTriggerFor]="userMenu" *ngIf="nameObject | async as name">
+  <button mat-button [matMenuTriggerFor]="userMenu" *ngIf="(auth.currentUser | async)?.name as name">
     <mat-icon>account_box</mat-icon>
     {{name}}
   </button>
-  <a mat-button routerLink="/login" *ngIf="!(nameObject | async)">
+  <a mat-button routerLink="/login" *ngIf="!(auth.currentUser | async)">
     <mat-icon>account_box</mat-icon>
     Login</a>
 </mat-toolbar>
diff --git a/overlord/src/app/core/nav-bar/nav-bar.component.ts b/overlord/src/app/core/nav-bar/nav-bar.component.ts
index 8eae9e40..b9588985 100644
--- a/overlord/src/app/core/nav-bar/nav-bar.component.ts
+++ b/overlord/src/app/core/nav-bar/nav-bar.component.ts
@@ -1,25 +1,19 @@
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
 import {AuthService} from '../../auth/auth.service';
-import {Subject} from 'rxjs/internal/Subject';
+import {Router} from '@angular/router';
 
 @Component({
   selector: 'app-nav-bar',
   templateUrl: './nav-bar.component.html',
   styleUrls: ['./nav-bar.component.css']
 })
-export class NavBarComponent implements OnInit {
-  public nameObject = new Subject<string>();
+export class NavBarComponent {
 
-  constructor(private auth: AuthService) {
+  constructor(private router: Router, private auth: AuthService) {
   }
 
-  ngOnInit() {
-    this.auth.userObservable.subscribe((user) => {
-      if (user.isAuthenticated) {
-        this.nameObject.next(user.name);
-      } else {
-        this.nameObject.next(null);
-      }
-    });
-  }
+    logout() {
+        this.auth.logout();
+        this.router.navigate(['/']);
+    }
 }
diff --git a/overlord/src/app/core/user.ts b/overlord/src/app/core/user.ts
index 2dd641fd..9bf7d5e3 100644
--- a/overlord/src/app/core/user.ts
+++ b/overlord/src/app/core/user.ts
@@ -3,9 +3,11 @@ export class User {
   name: string;
   password: string;
   lockedOut: boolean;
-  groups: UserGroup[];
+  roles?: UserGroup[];
   perms: string[];
   isAuthenticated: boolean;
+  access_token?: string;
+  exp?: bigint;
 
   public constructor(init?: Partial<User>) {
     Object.assign(this, init);