diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryViewModel.kt
index f4900f548..27db0c842 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryViewModel.kt
@@ -177,6 +177,7 @@ class LoginEntryViewModel(
                 val pushConfigurationStateWrapper = PushConfigurationStateWrapper(PushConfigurationState.PENDING, 0)
                 pushConfiguration.pushConfigurationStateWrapper = pushConfigurationStateWrapper
                 user!!.pushConfiguration = pushConfiguration
+                user!!.id = null
                 withContext(Dispatchers.IO) {
                     user!!.id = usersRepository.insertUser(user!!.toUserEntity())
                     usersRepository.setUserAsActiveWithId(user!!.id!!)
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/settingsflow/settings/SettingsViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/settingsflow/settings/SettingsViewModel.kt
index 117c77a80..01f01ad25 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/settingsflow/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/settingsflow/settings/SettingsViewModel.kt
@@ -22,6 +22,9 @@
 package com.nextcloud.talk.newarch.features.settingsflow.settings
 
 import android.app.Application
+import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkManager
+import com.nextcloud.talk.jobs.AccountRemovalWorker
 import com.nextcloud.talk.newarch.data.source.remote.ApiErrorHandler
 import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository
 import com.nextcloud.talk.newarch.local.models.User
@@ -77,6 +80,9 @@ class SettingsViewModel constructor(
             }
         }
 
+        val accountRemovalWork = OneTimeWorkRequest.Builder(AccountRemovalWorker::class.java)
+                .build()
+        WorkManager.getInstance(context).enqueue(accountRemovalWork)
         weHaveActiveUser
     }