diff --git a/plugins/login-resources/src/components/ConfirmationSend.svelte b/plugins/login-resources/src/components/ConfirmationSend.svelte
index 46ff0312d4..cb1a48215c 100644
--- a/plugins/login-resources/src/components/ConfirmationSend.svelte
+++ b/plugins/login-resources/src/components/ConfirmationSend.svelte
@@ -20,7 +20,7 @@
 
   onMount(async () => {
     const account = await getAccount()
-    if (account?.confirmed !== true) {
+    if (account?.confirmed === true) {
       const loc = getCurrentLocation()
       loc.path[1] = 'selectWorkspace'
       loc.path.length = 2
@@ -29,7 +29,7 @@
   })
 </script>
 
-<div class="flex-center h-full p-10">
+<div class="flex-center h-full p-10 caption-color">
   <div class="flex-col-center text-center">
     <h4>
       <Label label={login.string.ConfirmationSent} />
diff --git a/plugins/login-resources/src/components/SelectWorkspace.svelte b/plugins/login-resources/src/components/SelectWorkspace.svelte
index e66527b434..42424dd911 100644
--- a/plugins/login-resources/src/components/SelectWorkspace.svelte
+++ b/plugins/login-resources/src/components/SelectWorkspace.svelte
@@ -50,7 +50,15 @@
 
   async function _getWorkspaces (): Promise<Workspace[]> {
     try {
-      return getWorkspaces()
+      const res = await getWorkspaces()
+      if (res.length === 0 && account?.confirmed === false) {
+        const loc = getCurrentLocation()
+        loc.path[1] = 'confirmationSend'
+        loc.path.length = 2
+        navigate(loc)
+        return []
+      }
+      return res
     } catch (err: any) {
       setMetadataLocalStorage(presentation.metadata.Token, null)
       setMetadataLocalStorage(login.metadata.LoginEndpoint, null)