diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
index e956c344e8c4acbf2c0dc990d192f36e0ca79712..8fb7b008bc0e24c981fc08cf4817541ff916109d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
@@ -218,8 +218,10 @@ abstract class NetworkBaseFragment : SettingsFragment(), SettingsFragment.Savabl
     customratelimitsEnabled.setDependent(customratelimitsGroup)
     customratelimitsUnlimited.setOnCheckedChangeListener { _, isChecked ->
       customratelimitsBurstSize.isEnabled = !isChecked
-      customratelimitsBurstSize.isEnabled = !isChecked
+      customratelimitsDelay.isEnabled = !isChecked
     }
+    customratelimitsBurstSize.isEnabled = !customratelimitsUnlimited.isChecked
+    customratelimitsDelay.isEnabled = !customratelimitsUnlimited.isChecked
 
     return view
   }
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt
index 8e175f78259a7f387ba8af5ff19b8ce3f4b26bdc..b98f4d1fff9cb290a824b003dd9d9f2b412a43ca 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt
@@ -115,6 +115,7 @@ class NetworkServerFragment : SettingsFragment(), SettingsFragment.Savable,
     sslEnabled.setOnCheckedChangeListener { _, isChecked ->
       sslVerify.isEnabled = isChecked
     }
+    sslVerify.isEnabled = sslEnabled.isChecked
 
     return view
   }