1 files changed, 16 insertions, 11 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
index 50f0f5940c..6f978cd46f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
@@ -183,27 +183,32 @@ class AccountCache(private val endpoint: ServiceEndpoint) {
     }
 
     private suspend fun doLogin(account: String) {
-        if (account == accountNumber) {
-            return
-        }
-
         val result = daemon.await().getAccountData(account)
 
-        val expiry = when (result) {
-            is GetAccountDataResult.Ok -> DateTime.parse(result.accountData.expiry, EXPIRY_FORMAT)
-            is GetAccountDataResult.RpcError -> null
-            else -> return
+        when (result) {
+            is GetAccountDataResult.Ok -> {
+                val expiry = DateTime.parse(result.accountData.expiry, EXPIRY_FORMAT)
+
+                finishLogin(account, expiry)
+            }
+            is GetAccountDataResult.RpcError -> finishLogin(account, null)
+            else -> finishLogin(null, null)
         }
+    }
 
+    private suspend fun finishLogin(maybeAccount: String?, expiry: DateTime?) {
         synchronized(this) {
             markAccountAsNotNew()
 
-            accountNumber = account
+            accountNumber = maybeAccount
             accountExpiry = expiry
-            loginStatus = LoginStatus(account, expiry, false)
+
+            loginStatus = maybeAccount?.let { account ->
+                LoginStatus(account, expiry, false)
+            }
         }
 
-        daemon.await().setAccount(account)
+        daemon.await().setAccount(maybeAccount)
     }
 
     private suspend fun doLogout() {