diff --git a/lrcinstance.h b/lrcinstance.h
index 57fe69b5bc49e3cc11835a78e2a1a5cb38b750ee..12c5eb75bc8eb96797adca737ea72bf92e7f0077 100644
--- a/lrcinstance.h
+++ b/lrcinstance.h
@@ -94,10 +94,10 @@ public:
     };
 
     static const std::string& getCurrAccId() {
-        if (!instance().selectedAccountId.empty()) {
-            return instance().selectedAccountId;
+        if (instance().selectedAccountId.empty()) {
+            instance().selectedAccountId = accountModel().getAccountList().at(0);
         }
-        return accountModel().getAccountList()[0];
+        return instance().selectedAccountId;
     };
 
     static void setSelectedAccountId(const std::string& accountId) {
diff --git a/settingswidget.cpp b/settingswidget.cpp
index aa900e8b7e6e22a43c7bce5da9629d9ae8f82bd5..d8638f8b97746c417cca2ef2547346470aab2089 100644
--- a/settingswidget.cpp
+++ b/settingswidget.cpp
@@ -480,6 +480,7 @@ SettingsWidget::delAccountSlot()
     delDialog.exec();
 
     if (!LRCInstance::accountModel().getAccountList().size()) {
+        LRCInstance::setSelectedAccountId("");
         emit NavigationRequested(ScreenEnum::WizardScreen);
     }
 }