diff --git a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
index a35b5f6b0..8412532b5 100644
--- a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
@@ -133,13 +133,10 @@ class InstanceSettings : MaterialPreferenceFragment() {
         }
 
         val deleteAccount = findPreference<Preference>(PreferenceKeys.DELETE_ACCOUNT)
+        deleteAccount?.isEnabled = PreferenceHelper.getToken() != ""
         deleteAccount?.setOnPreferenceClickListener {
-            if (PreferenceHelper.getToken() != "") {
-                val newFragment = DeleteAccountDialog()
-                newFragment.show(childFragmentManager, DeleteAccountDialog::class.java.name)
-            } else {
-                Toast.makeText(context, R.string.login_first, Toast.LENGTH_SHORT).show()
-            }
+            val newFragment = DeleteAccountDialog()
+            newFragment.show(childFragmentManager, DeleteAccountDialog::class.java.name)
             true
         }
 
diff --git a/app/src/main/java/com/github/libretube/preferences/NotificationSettings.kt b/app/src/main/java/com/github/libretube/preferences/NotificationSettings.kt
index 0e12388e8..0feaf5ed5 100644
--- a/app/src/main/java/com/github/libretube/preferences/NotificationSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/NotificationSettings.kt
@@ -20,16 +20,27 @@ class NotificationSettings : MaterialPreferenceFragment() {
 
         val notificationsEnabled =
             findPreference<SwitchPreferenceCompat>(PreferenceKeys.NOTIFICATION_ENABLED)
-        notificationsEnabled?.setOnPreferenceChangeListener { _, _ ->
+        val checkingFrequency = findPreference<ListPreference>(PreferenceKeys.CHECKING_FREQUENCY)
+        val requiredNetwork = findPreference<ListPreference>(PreferenceKeys.REQUIRED_NETWORK)
+
+        notificationsEnabled?.setOnPreferenceChangeListener { _, newValue ->
+            checkingFrequency?.isEnabled = newValue as Boolean
+            requiredNetwork?.isEnabled = newValue
             updateNotificationPrefs()
             true
         }
 
-        val checkingFrequency = findPreference<ListPreference>(PreferenceKeys.CHECKING_FREQUENCY)
+        checkingFrequency?.isEnabled = notificationsEnabled!!.isChecked
         checkingFrequency?.setOnPreferenceChangeListener { _, _ ->
             updateNotificationPrefs()
             true
         }
+
+        requiredNetwork?.isEnabled = notificationsEnabled.isChecked
+        requiredNetwork?.setOnPreferenceChangeListener { _, _ ->
+            updateNotificationPrefs()
+            true
+        }
     }
 
     private fun updateNotificationPrefs() {