diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index 8e516d09d67d8310c5a39fe2b197fbbd691117b5..91b831694ea3df569524ac4f48f827448f85cba0 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -1062,7 +1062,7 @@ JamiAccount::loadAccount(const std::string& archive_password, const std::string&
                 JAMI_WARN("Auth error: %d %s", (int)error, message.c_str());
                 setRegistrationState(RegistrationState::ERROR_GENERIC);
                 runOnMainThread([w = weak()] {
-                    Manager::instance().removeAccount(w.lock()->getAccountID());
+                    Manager::instance().removeAccount(w.lock()->getAccountID(), true);
                 });
             }, std::move(callbacks));
         }
diff --git a/src/manager.cpp b/src/manager.cpp
index badf5caedffb3790d08a079f929964c328435043..fac2a86441ed80a37d634abe04d1309042a2a616 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -815,7 +815,7 @@ Manager::finish() noexcept
 
         for (const auto &account : getAllAccounts<JamiAccount>()) {
             if (account->getRegistrationState() == RegistrationState::INITIALIZING)
-                removeAccount(account->getAccountID());
+                removeAccount(account->getAccountID(), true);
         }
 
         saveConfig();