diff --git a/.dockerignore b/.dockerignore
index bcf90cc7d..165273380 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -9,4 +9,5 @@ npm-debug.log
 /metadata
 dev.js
 /test/
-/client/.nuxt/
\ No newline at end of file
+/client/.nuxt/
+/client/dist/
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index f4db32f8b..cee07aab2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ node_modules/
 /audiobooks2/
 /metadata/
 /test/
-/client/.nuxt/
\ No newline at end of file
+/client/.nuxt/
+/client/dist/
\ No newline at end of file
diff --git a/client/layouts/default.vue b/client/layouts/default.vue
index 701d25650..a33d65f21 100644
--- a/client/layouts/default.vue
+++ b/client/layouts/default.vue
@@ -10,6 +10,7 @@
 
 <script>
 export default {
+  middleware: 'authenticated',
   data() {
     return {
       socket: null
@@ -140,11 +141,6 @@ export default {
       this.socket.on('scan_progress', this.scanProgress)
     }
   },
-  beforeMount() {
-    if (!this.$store.state.user.user) {
-      this.$router.replace(`/login?redirect=${this.$route.path}`)
-    }
-  },
   mounted() {
     this.initializeSocket()
   }
diff --git a/client/middleware/authenticated.js b/client/middleware/authenticated.js
new file mode 100644
index 000000000..cf64bf91f
--- /dev/null
+++ b/client/middleware/authenticated.js
@@ -0,0 +1,6 @@
+export default function ({ store, redirect, route }) {
+  // If the user is not authenticated
+  if (!store.state.user.user) {
+    return redirect(`/login?redirect=${route.path}`)
+  }
+}
\ No newline at end of file
diff --git a/client/package.json b/client/package.json
index d2124d343..6e9a2e483 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "0.9.7-beta",
+  "version": "0.9.71-beta",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/client/pages/login.vue b/client/pages/login.vue
index fe76ea9eb..06ec3c6b1 100644
--- a/client/pages/login.vue
+++ b/client/pages/login.vue
@@ -34,16 +34,11 @@ export default {
   watch: {
     user(newVal) {
       if (newVal) {
-        // if (process.env.NODE_ENV !== 'production') {
         if (this.$route.query.redirect) {
           this.$router.replace(this.$route.query.redirect)
         } else {
           this.$router.replace('/')
         }
-
-        // } else {
-        //   window.location.reload()
-        // }
       }
     }
   },
@@ -56,7 +51,7 @@ export default {
     async submitForm() {
       this.error = null
       this.processing = true
-      // var uri = `${process.env.serverUrl}/auth`
+
       var payload = {
         username: this.username,
         password: this.password || ''
diff --git a/client/store/audiobooks.js b/client/store/audiobooks.js
index f368ace0c..53ff5a4d8 100644
--- a/client/store/audiobooks.js
+++ b/client/store/audiobooks.js
@@ -39,7 +39,11 @@ export const getters = {
 }
 
 export const actions = {
-  load({ commit }) {
+  load({ commit, rootState }) {
+    if (!rootState.user || !rootState.user.user) {
+      console.error('audiobooks/load - User not set')
+      return
+    }
     this.$axios
       .$get(`/api/audiobooks`)
       .then((data) => {
diff --git a/client/store/user.js b/client/store/user.js
index 9d4e6d5cf..0688c681d 100644
--- a/client/store/user.js
+++ b/client/store/user.js
@@ -48,10 +48,12 @@ export const actions = {
 export const mutations = {
   setUser(state, user) {
     state.user = user
-    if (user && user.token) {
-      localStorage.setItem('token', user.token)
-    } else if (user) {
+    if (user) {
+      if (user.token) localStorage.setItem('token', user.token)
+      console.log('setUser', user.username)
+    } else {
       localStorage.removeItem('token')
+      console.warn('setUser cleared')
     }
   },
   setSettings(state, settings) {
diff --git a/package.json b/package.json
index 5360ce748..286bc2057 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "0.9.7-beta",
+  "version": "0.9.71-beta",
   "description": "Self-hosted audiobook server for managing and playing audiobooks.",
   "main": "index.js",
   "scripts": {
diff --git a/server/Auth.js b/server/Auth.js
index ca626eb80..d1fcb8d49 100644
--- a/server/Auth.js
+++ b/server/Auth.js
@@ -42,7 +42,7 @@ class Auth {
     const authHeader = req.headers['authorization']
     const token = authHeader && authHeader.split(' ')[1]
     if (token == null) {
-      Logger.error('Api called without a token')
+      Logger.error('Api called without a token', req.path)
       return res.sendStatus(401)
     }
 
diff --git a/server/Server.js b/server/Server.js
index 07423a50b..74532a8df 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -106,8 +106,8 @@ class Server {
     app.use(this.auth.cors)
 
     // Static path to generated nuxt
+    const distPath = Path.join(global.appRoot, '/client/dist')
     if (process.env.NODE_ENV === 'production') {
-      const distPath = Path.join(global.appRoot, '/client/dist')
       app.use(express.static(distPath))
       app.use('/local', express.static(this.AudiobookPath))
     } else {
@@ -119,14 +119,13 @@ class Server {
     app.use(express.urlencoded({ extended: true }));
     app.use(express.json())
 
+    // Dynamic routes are not generated on client
+    app.get('/audiobook/:id', (req, res) => res.sendFile(Path.join(distPath, 'index.html')))
+
     app.use('/api', this.authMiddleware.bind(this), this.apiController.router)
     app.use('/hls', this.authMiddleware.bind(this), this.hlsController.router)
     app.use('/feeds', this.rssFeeds.router)
 
-    app.get('/', (req, res) => {
-      res.sendFile('/index.html')
-    })
-
     app.post('/login', (req, res) => this.auth.login(req, res))
     app.post('/logout', this.logout.bind(this))
     app.get('/ping', (req, res) => {