diff --git a/app/src/main/res/layout/settings_chatlist.xml b/app/src/main/res/layout/settings_chatlist.xml
index 796d1362ae3c4fc4a6b5d1ab6214c295dbb8d296..11a0634f18afd617cca8834b1a2b924116f157f6 100644
--- a/app/src/main/res/layout/settings_chatlist.xml
+++ b/app/src/main/res/layout/settings_chatlist.xml
@@ -60,16 +60,19 @@
       <android.support.v7.widget.SwitchCompat
         android:id="@+id/show_search"
         style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:checked="true"
         android:text="@string/settings_chatlist_show_search" />
 
       <android.support.v7.widget.SwitchCompat
         android:id="@+id/sort_alphabetically"
         style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:checked="true"
         android:text="@string/settings_chatlist_sort_alphabetically" />
 
       <android.support.v7.widget.SwitchCompat
         android:id="@+id/add_new_buffers_automatically"
         style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:checked="true"
         android:text="@string/settings_chatlist_add_new_buffers_automatically" />
     </LinearLayout>
 
@@ -99,6 +102,7 @@
       <android.support.v7.widget.SwitchCompat
         android:id="@+id/show_status_buffer"
         style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:checked="true"
         android:text="@string/settings_chatlist_show_status_buffer" />
     </LinearLayout>
 
@@ -123,11 +127,13 @@
       <android.support.v7.widget.SwitchCompat
         android:id="@+id/show_channels"
         style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:checked="true"
         android:text="@string/settings_chatlist_show_channels" />
 
       <android.support.v7.widget.SwitchCompat
         android:id="@+id/show_queries"
         style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:checked="true"
         android:text="@string/settings_chatlist_show_queries" />
     </LinearLayout>
 
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt
index a0a2125281e283228637c073c8ef4b3eb92943f8..af19a760eff99d9f629ee7fb6050c645a36bd55b 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt
@@ -101,8 +101,8 @@ class BufferViewConfig constructor(
     _hideInactiveBuffers = properties["hideInactiveBuffers"].valueOr(this::hideInactiveBuffers)
     _hideInactiveNetworks = properties["hideInactiveNetworks"].valueOr(this::hideInactiveNetworks)
     _disableDecoration = properties["disableDecoration"].valueOr(this::disableDecoration)
-    _allowedBufferTypes = properties["allowedBufferTypes"].valueOr(this::allowedBufferTypes)
-    _minimumActivity = properties["minimumActivity"].valueOr(this::minimumActivity)
+    _allowedBufferTypes = Buffer_Type.of(properties["allowedBufferTypes"].value(_allowedBufferTypes.value.toInt()).toShort())
+    _minimumActivity = Buffer_Activity.of(properties["minimumActivity"].value(_minimumActivity.value))
     _showSearch = properties["showSearch"].valueOr(this::showSearch)
   }