diff --git a/src/components/Home.vue b/src/components/Home.vue
index 44f1a74..7bd9b39 100644
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -1,11 +1,26 @@
 <template>
   <div>
-    HOME
+    <RoomList />
+    <v-btn block class="outlined-button" @click.stop="logout">Logout</v-btn>
   </div>
 </template>
 
 <script>
+import RoomList from '../components/RoomList';
+
 export default {
+  components: {
+    RoomList
+  },
+  methods: {
+    logout() {
+      //TODO - For guest accounts, show warning about not being able to rejoin.
+      this.$store.dispatch("auth/logout");
+      this.$nextTick(() => {
+        this.$navigation.push({path: "/login"}, -1);
+      })
+    },
+  }
 };
 </script>
 
diff --git a/src/components/LeaveRoomDialog.vue b/src/components/LeaveRoomDialog.vue
index 6018b01..9317b52 100644
--- a/src/components/LeaveRoomDialog.vue
+++ b/src/components/LeaveRoomDialog.vue
@@ -64,7 +64,7 @@ export default {
       this.$matrix.leaveRoom(roomId)
       .then(() => {
         console.log("Left room");
-        this.$navigation.push({name:'Chat', params:{roomId:null}}, -1);
+        this.$navigation.push({name:'Home', params:{roomId:null}}, -1);
       })
       .catch(err => {
         console.log("Error leaving", err);
diff --git a/src/components/Login.vue b/src/components/Login.vue
index f5ce2bf..4dac825 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -121,7 +121,11 @@ export default {
         this.loading = true;
         this.$store.dispatch("auth/login", user).then(
           () => {
-            this.$navigation.push({name: "Chat", params: { roomId: util.sanitizeRoomId(this.$matrix.currentRoomId) }}, -1);
+            if (this.$matrix.currentRoomId) {
+              this.$navigation.push({name: "Chat", params: { roomId: util.sanitizeRoomId(this.$matrix.currentRoomId) }}, -1);
+            } else {
+              this.$navigation.push({name: "Home"}, -1);            
+            }
           },
           (error) => {
             this.loading = false;
diff --git a/src/components/RoomInfo.vue b/src/components/RoomInfo.vue
index c8c2f49..6b5b3a8 100644
--- a/src/components/RoomInfo.vue
+++ b/src/components/RoomInfo.vue
@@ -291,10 +291,6 @@ export default {
       this.$navigation.push({ name: "Profile" }, 1);
     },
 
-    leaveRoom() {
-      console.log("Leave");
-    },
-
     upgradeAccount() {
       this.$matrix
         .upgradeGuestAccount()
diff --git a/src/router/index.js b/src/router/index.js
index 132516f..12f2665 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-//import Home from '../components/Home.vue'
+import Home from '../components/Home.vue'
 import Chat from '../components/Chat.vue'
 import Join from '../components/Join.vue'
 import Login from '../components/Login.vue'
@@ -13,7 +13,7 @@ const routes = [
   {
     path: '/',
     name: 'Home',
-    component: Chat
+    component: Home
   },
   {
     path: '/room/:roomId?',