diff --git a/src/components/Player.vue b/src/components/Player.vue
index 98a6d99..92e2fdc 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -47,7 +47,6 @@ export default {
     video: Object,
     sponsors: Object,
     skipToTime: Number,
-    selectedAutoPlay: Boolean,
     selectedAutoLoop: Boolean
   },
   data () {
diff --git a/src/routes/Preferences.vue b/src/routes/Preferences.vue
index ab3c4d0..a71759d 100644
--- a/src/routes/Preferences.vue
+++ b/src/routes/Preferences.vue
@@ -2,11 +2,13 @@
   <v-container fluid>
     <h1 class="text-h4 text-center">{{ $t('titles.preferences') }}</h1>
     <v-divider class="ma-4" />
-    <div style="display: flex;" v-for="(opt, optId) in options" :key="optId">
-      <v-simple-checkbox
+    <div v-for="(opt, optId) in options" :key="optId">
+      <v-checkbox
         v-if="opt.type === 'bool'"
-        :value="$store.getters['prefs/getPreferenceBoolean'](opt.id, opt.default)"
-        @input="setValue(opt.id, $event)"
+        dense
+        :label="$t('preferences.' + opt.id)"
+        :input-value="$store.getters['prefs/getPreferenceBoolean'](opt.id, opt.default)"
+        @change="setValue(opt.id, $event)"
       />
       <v-text-field
         v-else-if="opt.type === 'number'"
@@ -21,7 +23,6 @@
         :value="$store.getters['prefs/getPreference'](opt.id, opt.default)"
         @input="setValue(opt.id, $event)" :items="opt.options"
       />
-      <p v-if="opt.type === 'bool'">{{ $t('preferences.' + opt.id) }}</p><br />
     </div>
     <h5 class="text-h5">{{ $t('actions.instances_list') }}</h5>
     <v-data-table :headers="tableHeaders" :items="instances" />
diff --git a/src/routes/WatchVideo.vue b/src/routes/WatchVideo.vue
index cf80e34..31077d1 100644
--- a/src/routes/WatchVideo.vue
+++ b/src/routes/WatchVideo.vue
@@ -7,7 +7,6 @@
       :video="video"
       :skip-to-time="'t' in $route.query ? Number($route.query.t) : null"
       :sponsors="sponsors"
-      :selectedAutoPlay="isAutoplayEnabled"
       :selectedAutoLoop="selectedAutoLoop"
       @videoEnded="videoEnded"
     />
@@ -71,7 +70,7 @@
             </div>
             <div>
               <!-- TODO translate -->
-              <v-checkbox dense :value="isAutoplayEnabled" @change="onAutoplayChg" label="Autoplay Next Video" />
+              <v-checkbox dense :input-value="isAutoplayEnabled" @change="onAutoplayChg" label="Autoplay Next Video" />
               <v-checkbox dense v-model="selectedAutoLoop" label="Loop this video" />
             </div>
           </v-card-text>
diff --git a/src/store/authentication-store.js b/src/store/authentication-store.js
index 4076159..d386a9c 100644
--- a/src/store/authentication-store.js
+++ b/src/store/authentication-store.js
@@ -41,7 +41,7 @@ const AuthenticationStore = {
 
   getters: {
     isCurrentlyAuthenticated (state, getters, rootState, rootGetters) {
-      return state.authStateByInstance[rootGetters['prefs/apiUrl']]?.isAuthenticated
+      return state.authStateByInstance[rootGetters['prefs/apiUrl']]?.isAuthenticated === true
     },
 
     authToken (state, getters, rootState, rootGetters) {