diff --git a/components/app/SideDrawer.vue b/components/app/SideDrawer.vue
index 0f177250..2abdd67a 100644
--- a/components/app/SideDrawer.vue
+++ b/components/app/SideDrawer.vue
@@ -183,11 +183,18 @@ export default {
       await this.$hapticsImpact()
       await this.logout()
 
+      // Redirect to home page
       if (this.$route.name !== 'bookshelf') {
         this.$router.replace('/bookshelf')
-      } else {
-        location.reload()
       }
+
+      // If player is open and not playing locally, then close the player
+      if (this.$store.getters['getIsPlayerOpen']) {
+        this.$eventBus.$emit('close-stream')
+      }
+
+      // Close side drawer
+      this.show = false
     },
     touchstart(e) {
       this.touchEvent = new TouchEvent(e)
diff --git a/pages/bookshelf/index.vue b/pages/bookshelf/index.vue
index add53443..54534d7e 100644
--- a/pages/bookshelf/index.vue
+++ b/pages/bookshelf/index.vue
@@ -74,6 +74,12 @@ export default {
         console.log(`[categories] networkConnected false so fetching categories`)
         this.fetchCategories()
       }
+    },
+    user(newVal, oldVal) {
+      if ((newVal && !oldVal) || (!newVal && oldVal)) {
+        console.log(`[categories] user changed so fetching categories`)
+        this.fetchCategories()
+      }
     }
   },
   computed: {