diff --git a/plugins/login-resources/src/components/SelectWorkspace.svelte b/plugins/login-resources/src/components/SelectWorkspace.svelte
index 8d28fbfb79..aeb6c40c4d 100644
--- a/plugins/login-resources/src/components/SelectWorkspace.svelte
+++ b/plugins/login-resources/src/components/SelectWorkspace.svelte
@@ -14,34 +14,44 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { isActiveMode, isArchivingMode, isRestoringMode, isUpgradingMode } from '@hcengineering/core'
-  import { LoginInfo, WorkspaceInfoWithStatus } from '@hcengineering/login'
+  import {
+    WorkspaceInfoWithStatus,
+    isActiveMode,
+    isArchivingMode,
+    isRestoringMode,
+    isUpgradingMode
+  } from '@hcengineering/core'
+  import { LoginInfo } from '@hcengineering/login'
   import { OK, Severity, Status } from '@hcengineering/platform'
   import presentation, { MessageBox, NavLink, isAdminUser, reduceCalls } from '@hcengineering/presentation'
   import {
-    ticker,
     Button,
     Label,
     Scroller,
     SearchEdit,
     Spinner,
     deviceOptionsStore as deviceInfo,
-    showPopup
+    showPopup,
+    ticker
   } from '@hcengineering/ui'
   import { logOut } from '@hcengineering/workbench'
   import { onMount } from 'svelte'
 
   import login from '../plugin'
   import {
-    fetchWorkspace,
     getAccount,
+    getAccountDisplayName,
+    getHref,
     getWorkspaces,
     goTo,
     navigateToWorkspace,
     selectWorkspace,
-    getAccountDisplayName
+    unArchive
   } from '../utils'
   import StatusControl from './StatusControl.svelte'
+
+  export let navigateUrl: string | undefined = undefined
+
   let workspaces: WorkspaceInfoWithStatus[] = []
   let status = OK
   let accountPromise: Promise<LoginInfo | null>
@@ -75,8 +85,9 @@
     status = new Status(Severity.INFO, login.status.ConnectingToServer, {})
 
     const [loginStatus, result] = await selectWorkspace(workspaceUrl)
-    if (isArchivingMode(result?.mode) && result?.workspaceId !== undefined) {
-      const workspaceId = result?.workspaceId
+
+    const ws = workspaces.find((it) => it.uuid === result?.workspace)
+    if (ws != null && isArchivingMode(ws?.mode) && result?.workspace !== undefined) {
       showPopup(MessageBox, {
         label: login.string.SelectWorkspace,
         message: login.string.WorkspaceArchivedDesc,
@@ -84,13 +95,13 @@
         params: {},
         okLabel: login.string.RestoreArchivedWorkspace,
         action: async () => {
-          if (await unArchive(workspaceId, result.token)) {
+          if (await unArchive(ws.uuid, result.token)) {
             workspaces = await getWorkspaces()
-            let info = workspaces.filter((it) => it.workspaceId === workspaceId).shift()
+            let info = workspaces.find((it) => it.uuid === ws.uuid)
             while (isRestoringMode(info?.mode) || isUpgradingMode(info?.mode)) {
               await new Promise<void>((resolve) => setTimeout(resolve, 5000))
               workspaces = await getWorkspaces()
-              info = workspaces.filter((it) => it.workspaceId === workspaceId).shift()
+              info = workspaces.find((it) => it.uuid === ws.uuid)
             }
           }
         }
diff --git a/tests/sanity/tests/model/login-page.ts b/tests/sanity/tests/model/login-page.ts
index 0418d72121..985db07c73 100644
--- a/tests/sanity/tests/model/login-page.ts
+++ b/tests/sanity/tests/model/login-page.ts
@@ -12,6 +12,7 @@ export class LoginPage {
   inputPassword = (): Locator => this.page.locator('input[name=current-password]')
   buttonLogin = (): Locator => this.page.locator('button', { hasText: 'Log In' })
   loginWithPassword = (): Locator => this.page.locator('a', { hasText: 'Login with password' })
+  signUpWithPassword = (): Locator => this.page.locator('a', { hasText: 'Sign up with password' })
   linkSignUp = (): Locator => this.page.locator('a.title', { hasText: 'Sign Up' })
   invalidCredentialsMessage = (): Locator =>
     this.page.getByText('Account not found or the provided credentials are incorrect')
@@ -38,6 +39,7 @@ export class LoginPage {
 
   async clickSignUp (): Promise<void> {
     await this.linkSignUp().click()
+    await this.signUpWithPassword().click()
   }
 
   async clickOnRecover (): Promise<void> {