diff --git a/plugins/login-resources/src/components/SelectWorkspace.svelte b/plugins/login-resources/src/components/SelectWorkspace.svelte
index ec34a03f96..7eb549204c 100644
--- a/plugins/login-resources/src/components/SelectWorkspace.svelte
+++ b/plugins/login-resources/src/components/SelectWorkspace.svelte
@@ -48,12 +48,14 @@
 
   let workspaces: WorkspaceInfoWithStatus[] = []
   let status = OK
+  let accountPromise: Promise<LoginInfo | null>
   let account: LoginInfo | null | undefined = undefined
 
   let flagToUpdateWorkspaces = false
 
   async function loadAccount (): Promise<void> {
-    account = await getAccount()
+    accountPromise = getAccount()
+    account = await accountPromise
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -101,6 +103,7 @@
     try {
       const res = await getWorkspaces()
 
+      await accountPromise
       if (res.length === 0 && account?.token == null) {
         goTo('confirmationSend')
       }
diff --git a/plugins/setting-resources/src/components/Profile.svelte b/plugins/setting-resources/src/components/Profile.svelte
index e5dd8095df..397b267870 100644
--- a/plugins/setting-resources/src/components/Profile.svelte
+++ b/plugins/setting-resources/src/components/Profile.svelte
@@ -64,9 +64,10 @@
         const leaveWorkspace = await getResource(login.function.LeaveWorkspace)
         const loginInfo = await leaveWorkspace(getCurrentAccount().uuid)
 
+        const loc = getCurrentLocation()
+        clearMetadata(loc.path[1])
+
         if (loginInfo?.token != null) {
-          const loc = getCurrentLocation()
-          clearMetadata(loc.path[1])
           setMetadata(presentation.metadata.Token, loginInfo.token)
           setMetadataLocalStorage(login.metadata.LastToken, loginInfo.token)
           setMetadataLocalStorage(login.metadata.LoginAccount, loginInfo.account)