diff --git a/src/app/app.component.html b/src/app/app.component.html
index e7af6f86..ca8e23fa 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -170,6 +170,13 @@
             </ion-item>
           </ion-menu-toggle>
 
+          <ion-menu-toggle *ngIf="loggedIn" autoHide="false">
+            <ion-item button detail="false" (click)="logout()">
+              <ion-icon slot="start" name="log-out-outline" color="danger"></ion-icon>
+              <ion-label color="danger">Logout</ion-label>
+            </ion-item>
+          </ion-menu-toggle>
+
           <ion-item>
             <ion-icon slot="start" name="moon-outline"></ion-icon>
             <ion-label>Dark Mode</ion-label>
diff --git a/src/app/pages/account/account.html b/src/app/pages/account/account.html
index 10a196c4..b8666293 100644
--- a/src/app/pages/account/account.html
+++ b/src/app/pages/account/account.html
@@ -9,13 +9,13 @@
 </ion-header>
 
 <ion-content scrollEvents="true" (ionScroll)="onScroll($event)">
-  <div *ngIf="nickname" class="account-hero">
+  <div *ngIf="loggedIn" class="account-hero">
     <ion-icon name="person-circle" class="account-hero-icon"></ion-icon>
-    <h1>{{nickname}}</h1>
-    <p><code>{{email}}</code></p>
+    <h1>{{ nickname || email || 'Account' }}</h1>
+    <p *ngIf="nickname && email"><code>{{email}}</code></p>
   </div>
 
-  <div *ngIf="nickname" class="account-actions">
+  <div *ngIf="loggedIn" class="account-actions">
     <ion-button *ngIf="isSpeaker" expand="block" color="tertiary" (click)="openSpeakerDiscord()">
       <ion-icon slot="start" name="logo-discord"></ion-icon>
       Speaker Discord
diff --git a/src/app/pages/account/account.ts b/src/app/pages/account/account.ts
index f01f2ff0..09905dbe 100644
--- a/src/app/pages/account/account.ts
+++ b/src/app/pages/account/account.ts
@@ -20,6 +20,7 @@ export class AccountPage implements OnInit, AfterViewInit {
   showTitle = false;
   email: string;
   nickname: string;
+  loggedIn = false;
   isSpeaker: boolean = false;
 
   constructor(
@@ -43,6 +44,9 @@ export class AccountPage implements OnInit, AfterViewInit {
     this.getEmail();
     this.getNickname();
     this.checkIsSpeaker();
+    this.userData.isLoggedIn().then((loggedIn) => {
+      this.loggedIn = loggedIn;
+    });
   }
 
   getEmail() {
@@ -53,8 +57,12 @@ export class AccountPage implements OnInit, AfterViewInit {
 
   getNickname() {
     this.userData.getNickname().then((nickname) => {
-      if (nickname === null) {
-        this.router.navigate(['/app/tabs/login'], { replaceUrl: true });
+      if (!nickname) {
+        this.userData.isLoggedIn().then((loggedIn) => {
+          if (!loggedIn) {
+            this.router.navigate(['/app/tabs/login'], { replaceUrl: true });
+          }
+        });
       }
       this.nickname = nickname;
     });