diff --git a/src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt b/src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt
index 4e0ef30e51449ab292acc320f4aad459e5ba71d8..72562d66c12d3199185a64d19a43c64f90341e72 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt
@@ -3,6 +3,7 @@ package org.briarproject.briar.desktop
 import dagger.Component
 import org.briarproject.bramble.BrambleCoreEagerSingletons
 import org.briarproject.bramble.BrambleCoreModule
+import org.briarproject.bramble.api.account.AccountManager
 import org.briarproject.briar.BriarCoreEagerSingletons
 import org.briarproject.briar.BriarCoreModule
 import java.security.SecureRandom
@@ -21,4 +22,6 @@ internal interface BriarDesktopApp : BrambleCoreEagerSingletons, BriarCoreEagerS
     fun getUI(): UI
 
     fun getSecureRandom(): SecureRandom
+
+    fun getAccountManager(): AccountManager
 }
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
index d1e8b6ba30475c06e9d6c54312e192f26da3a5d3..4dc34b77dfc84fa019a5ae2a6de32b05f5b46984 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
@@ -80,7 +80,9 @@ constructor(
         val title = "Briar Desktop"
         var screenState by remember {
             mutableStateOf(
-                if (accountManager.accountExists()) {
+                if (accountManager.hasDatabaseKey()) {
+                    Screen.MAIN
+                } else if (accountManager.accountExists()) {
                     Screen.LOGIN
                 } else {
                     Screen.REGISTRATION
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/TestWithTemporaryAccount.kt b/src/test/kotlin/org/briarproject/briar/desktop/TestWithTemporaryAccount.kt
index 6dd7bbda2e8c9985fb3ea162fe97f9b1516cf9cb..15d9af08a10d7c82df233c408e71244e23292252 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/TestWithTemporaryAccount.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/TestWithTemporaryAccount.kt
@@ -37,6 +37,9 @@ private class TestWithTemporaryAccount {
         BrambleCoreEagerSingletons.Helper.injectEagerSingletons(app)
         BriarCoreEagerSingletons.Helper.injectEagerSingletons(app)
 
+        val password = "verySecret123!"
+        app.getAccountManager().createAccount("alice", password)
+
         app.getUI().startBriar()
     }