diff --git a/lib/appstate_container.dart b/lib/appstate_container.dart
index 06ceb38..54d53ef 100644
--- a/lib/appstate_container.dart
+++ b/lib/appstate_container.dart
@@ -277,15 +277,14 @@ class StateContainerState extends State<StateContainer> {
       } else {
         // Remove account
         updateRecentlyUsedAccounts().then((_) {
-          if (event.account.index == selectedAccount.index &&
-              recentLast != null) {
+          if (event.account.id == selectedAccount.id && recentLast != null) {
             sl.get<DBHelper>().changeAccount(recentLast);
             setState(() {
               selectedAccount = recentLast;
             });
             EventTaxiImpl.singleton()
                 .fire(AccountChangedEvent(account: recentLast, noPop: true));
-          } else if (event.account.index == selectedAccount.index &&
+          } else if (event.account.id == selectedAccount.id &&
               recentSecondLast != null) {
             sl.get<DBHelper>().changeAccount(recentSecondLast);
             setState(() {
@@ -293,7 +292,7 @@ class StateContainerState extends State<StateContainer> {
             });
             EventTaxiImpl.singleton().fire(
                 AccountChangedEvent(account: recentSecondLast, noPop: true));
-          } else if (event.account.index == selectedAccount.index) {
+          } else if (event.account.id == selectedAccount.id) {
             sl.get<DBHelper>().getMainAccount().then((mainAccount) {
               sl.get<DBHelper>().changeAccount(mainAccount);
               setState(() {
@@ -758,6 +757,7 @@ class StateContainerState extends State<StateContainer> {
         await sl.get<DBHelper>().changeToDefaultAccount();
         return null;
       }
+      return privKey;
     }
     return NanoUtil.seedToPrivate(
         await sl.get<Vault>().getSeed(), selectedAccount.index);
diff --git a/pubspec.yaml b/pubspec.yaml
index acef21d..f5ba4d1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,7 +7,7 @@ description: A new Flutter project.
 # Both the version and the builder number may be overridden in flutter
 # build by specifying --build-name and --build-number, respectively.
 # Read more about versioning at semver.org.
-version: 2.5.0+98
+version: 2.5.1+99
 
 environment:
   sdk: ">=2.11.99 <3.0.0"