diff --git a/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/MainActivity.kt b/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/MainActivity.kt
index d2904a4..c9a1940 100644
--- a/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/MainActivity.kt
+++ b/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/MainActivity.kt
@@ -179,6 +179,8 @@ class MainActivity : AppCompatActivity() {
                 .remove("PREF_CURRENT_ACCOUNT_STRING")
                 .apply()
             deleteDevice(this)
+            StartService.stopService()
+            FailureHandler.clearFails()
             showStart()
             finish()
             startActivity(intent)