diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
index 111e9c9d..a51ddf87 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
@@ -368,6 +368,7 @@ class MainActivity : AppCompatActivity() {
 
     fun logout() {
         credStore.clearLoginData()
+        timerControls.clear()
         internalClient = null
         // Storage gets cleaned in the resume function of the login fragment
         // because otherwise the cleanup functions of the LoggedIn fragment
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/debugging/GlobalDebugObject.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/debugging/GlobalDebugObject.kt
index 7ba0f149..2032f2a0 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/debugging/GlobalDebugObject.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/debugging/GlobalDebugObject.kt
@@ -38,4 +38,4 @@ class GlobalDebugObject {
             return result
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/CoordinatedDisconnectDialog.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/CoordinatedDisconnectDialog.kt
index 7c0d5878..46fa1fb1 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/CoordinatedDisconnectDialog.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/CoordinatedDisconnectDialog.kt
@@ -4,11 +4,12 @@ import android.app.ProgressDialog
 import android.content.DialogInterface
 import androidx.fragment.app.Fragment
 import androidx.navigation.Navigation.findNavController
+import eu.pkgsoftware.babybuddywidgets.BaseFragment
 import eu.pkgsoftware.babybuddywidgets.CredStore
 import eu.pkgsoftware.babybuddywidgets.R
 import eu.pkgsoftware.babybuddywidgets.networking.babybuddy.ConnectingDialogInterface
 
-class CoordinatedDisconnectDialog(val fragment: Fragment, val credStore: CredStore) {
+class CoordinatedDisconnectDialog(val fragment: BaseFragment, val credStore: CredStore) {
     private val dialog = ProgressDialog(fragment.requireContext())
     private var uniqueCounter = 1
     private val progressTrackers = mutableMapOf<String, Long>()
@@ -21,7 +22,7 @@ class CoordinatedDisconnectDialog(val fragment: Fragment, val credStore: CredSto
             ProgressDialog.BUTTON_NEGATIVE,
             fragment.resources.getString(R.string.disconnect_dialog_logout)
         ) { dialogInterface: DialogInterface, i: Int ->
-            credStore.clearLoginData()
+            fragment.mainActivity.logout()
             findNavController(fragment.requireView()).navigate(R.id.logoutOperation)
         }
     }
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/Client.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/Client.kt
index 6ca52ecb..5ad75ff1 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/Client.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/babybuddy/Client.kt
@@ -279,4 +279,4 @@ class Client(val credStore: ServerAccessProviderInterface) {
             }
         }
     }
-}
\ No newline at end of file
+}