diff --git a/plugins/login-assets/lang/cs.json b/plugins/login-assets/lang/cs.json
index 5a688b19ba..b3f3ebf249 100644
--- a/plugins/login-assets/lang/cs.json
+++ b/plugins/login-assets/lang/cs.json
@@ -19,6 +19,7 @@
     "DoNotHaveAnAccount": "Nemáte účet?",
     "PasswordRepeat": "Zopakujte heslo",
     "HaveAccount": "Již máte účet?",
+    "LoadingAccount": "Načítání...",
     "SelectWorkspace": "Vyberte pracovní prostor",
     "Copy": "Kopírovat",
     "Copied": "Zkopírováno",
diff --git a/plugins/login-assets/lang/en.json b/plugins/login-assets/lang/en.json
index e627fc91d8..efd8b57ede 100644
--- a/plugins/login-assets/lang/en.json
+++ b/plugins/login-assets/lang/en.json
@@ -19,6 +19,7 @@
     "DoNotHaveAnAccount": "Do not have an account?",
     "PasswordRepeat": "Repeat password",
     "HaveAccount": "Already have an account?",
+    "LoadingAccount": "Loading...",
     "SelectWorkspace": "Select workspace",
     "Copy": "Copy",
     "Copied": "Copied",
diff --git a/plugins/login-assets/lang/es.json b/plugins/login-assets/lang/es.json
index aa22e6039d..8dd31dde43 100644
--- a/plugins/login-assets/lang/es.json
+++ b/plugins/login-assets/lang/es.json
@@ -19,6 +19,7 @@
     "DoNotHaveAnAccount": "¿No tienes una cuenta?",
     "PasswordRepeat": "Repetir contraseña",
     "HaveAccount": "¿Ya tienes una cuenta?",
+    "LoadingAccount": "Cargando...",
     "SelectWorkspace": "Seleccionar espacio de trabajo",
     "Copy": "Copiar",
     "Copied": "Copiado",
diff --git a/plugins/login-assets/lang/fr.json b/plugins/login-assets/lang/fr.json
index f9831f3053..b442b854c1 100644
--- a/plugins/login-assets/lang/fr.json
+++ b/plugins/login-assets/lang/fr.json
@@ -19,6 +19,7 @@
     "DoNotHaveAnAccount": "Vous n'avez pas de compte ?",
     "PasswordRepeat": "Répétez le mot de passe",
     "HaveAccount": "Vous avez déjà un compte ?",
+    "LoadingAccount": "Chargement...",
     "SelectWorkspace": "Sélectionner un espace de travail",
     "Copy": "Copier",
     "Copied": "Copié",
diff --git a/plugins/login-assets/lang/it.json b/plugins/login-assets/lang/it.json
index 1ee337f375..9f59687b01 100644
--- a/plugins/login-assets/lang/it.json
+++ b/plugins/login-assets/lang/it.json
@@ -19,6 +19,7 @@
     "DoNotHaveAnAccount": "Non hai un account?",
     "PasswordRepeat": "Ripeti password",
     "HaveAccount": "Hai già un account?",
+    "LoadingAccount": "Caricamento...",
     "SelectWorkspace": "Seleziona spazio di lavoro",
     "Copy": "Copia",
     "Copied": "Copiato",
diff --git a/plugins/login-assets/lang/pt.json b/plugins/login-assets/lang/pt.json
index 244e29c3d1..754b9f81a4 100644
--- a/plugins/login-assets/lang/pt.json
+++ b/plugins/login-assets/lang/pt.json
@@ -19,6 +19,7 @@
     "DoNotHaveAnAccount": "Não tem uma conta?",
     "PasswordRepeat": "Repetir palavra-passe",
     "HaveAccount": "Já tem uma conta?",
+    "LoadingAccount": "Carregando...",
     "SelectWorkspace": "Selecionar espaço de trabalho",
     "Copy": "Copiar",
     "Copied": "Copiado",
diff --git a/plugins/login-assets/lang/ru.json b/plugins/login-assets/lang/ru.json
index 8112290770..0d49a61cbf 100644
--- a/plugins/login-assets/lang/ru.json
+++ b/plugins/login-assets/lang/ru.json
@@ -19,6 +19,7 @@
     "DoNotHaveAnAccount": "Нет учетной записи?",
     "PasswordRepeat": "Повторите пароль",
     "HaveAccount": "Уже есть учетная запись?",
+    "LoadingAccount": "Загрузка...",
     "SelectWorkspace": "Выбрать рабочее пространство",
     "Copy": "Копировать",
     "Copied": "Скопировано",
diff --git a/plugins/login-assets/lang/zh.json b/plugins/login-assets/lang/zh.json
index 9c7a2ca8f0..e5c44c87d6 100644
--- a/plugins/login-assets/lang/zh.json
+++ b/plugins/login-assets/lang/zh.json
@@ -19,6 +19,7 @@
     "DoNotHaveAnAccount": "还没有账户？",
     "PasswordRepeat": "重复密码",
     "HaveAccount": "已经有账户了？",
+    "LoadingAccount": "加载中...",
     "SelectWorkspace": "选择工作区",
     "Copy": "复制",
     "Copied": "已复制",
diff --git a/plugins/login-resources/src/components/SelectWorkspace.svelte b/plugins/login-resources/src/components/SelectWorkspace.svelte
index 7303da3c07..d8a47cf7ca 100644
--- a/plugins/login-resources/src/components/SelectWorkspace.svelte
+++ b/plugins/login-resources/src/components/SelectWorkspace.svelte
@@ -20,6 +20,7 @@
   import {
     Button,
     Label,
+    Spinner,
     Scroller,
     SearchEdit,
     deviceOptionsStore as deviceInfo,
@@ -95,7 +96,11 @@
 <form class="container" style:padding={$deviceInfo.docWidth <= 480 ? '1.25rem' : '5rem'}>
   <div class="grow-separator" />
   <div class="fs-title">
-    {account?.email}
+    {#if account?.email}
+      {account.email}
+    {:else}
+      <Label label={login.string.LoadingAccount} />
+    {/if}
   </div>
   <div class="title"><Label label={login.string.SelectWorkspace} /></div>
   <div class="status">
@@ -106,7 +111,11 @@
       <SearchEdit bind:value={search} width={'100%'} />
     </div>
   {/if}
-  {#await _getWorkspaces() then}
+  {#await _getWorkspaces()}
+    <div class="workspace-loader">
+      <Spinner />
+    </div>
+  {:then}
     <Scroller padding={'.125rem 0'} maxHeight={35}>
       <div class="form">
         {#each workspaces
@@ -207,6 +216,13 @@
     flex-grow: 1;
     overflow: hidden;
 
+    .workspace-loader {
+      height: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
     .title {
       font-weight: 600;
       font-size: 1.5rem;
diff --git a/plugins/login-resources/src/plugin.ts b/plugins/login-resources/src/plugin.ts
index d9b9c94ecf..9647fe18e1 100644
--- a/plugins/login-resources/src/plugin.ts
+++ b/plugins/login-resources/src/plugin.ts
@@ -32,6 +32,7 @@ export default mergeIds(loginId, login, {
     LastName: '' as IntlString,
     FirstName: '' as IntlString,
     HaveAccount: '' as IntlString,
+    LoadingAccount: '' as IntlString,
     Join: '' as IntlString,
     Email: '' as IntlString,
     Password: '' as IntlString,