diff --git a/src/apps/core/loginapp/LoginForm.svelte b/src/apps/core/loginapp/LoginForm.svelte
index afe7e0e0..89900cdd 100755
--- a/src/apps/core/loginapp/LoginForm.svelte
+++ b/src/apps/core/loginapp/LoginForm.svelte
@@ -17,7 +17,7 @@
 <div class="login-form">
   <div class="left">
     {#if !$persistence}
-      <Field bind:value={$username} placeholder="Username" icon="user" />
+      <Field bind:value={$username} placeholder="Username/Email" icon="user" />
     {/if}
     <Field bind:value={$password} placeholder="Password" icon="key-round" password onsubmit={go} />
   </div>
diff --git a/src/apps/core/loginapp/runtime.ts b/src/apps/core/loginapp/runtime.ts
index a1599627..f5b1987b 100755
--- a/src/apps/core/loginapp/runtime.ts
+++ b/src/apps/core/loginapp/runtime.ts
@@ -290,23 +290,33 @@ export class LoginAppRuntime extends AppProcess implements ILoginAppRuntime {
   //#endregion
   //#region CREDENTIALS
 
-  async proceed(username: string, password: string) {
-    this.Log(`Trying login of '${username}'`);
+  async proceed(identifier: string, password: string) {
+    this.Log(`Trying login of '${identifier}'`);
 
-    this.loadingStatus.set(`Hi, ${username}!`);
-
-    const tokenResult = await LoginUser(username, password);
+    const tokenResult = await LoginUser(identifier, password);
 
     if (!tokenResult.success) {
       this.loadingStatus.set("");
-      this.errorMessage.set(tokenResult.errorMessage ?? "Username or password incorrect");
+      this.errorMessage.set(tokenResult.errorMessage ?? "Username/Email or password incorrect");
 
       this.updateServerStuff();
 
       return;
     }
 
-    await this.startDaemon(tokenResult.result!, username);
+    const userInfo = await this.validateUserToken(tokenResult.result!);
+    if (!userInfo) {
+      this.resetCookies();
+
+      this.loadingStatus.set("");
+      this.errorMessage.set("Session token is invalid.");
+
+      return;
+    }
+
+    this.loadingStatus.set(`Hi, ${userInfo.username}!`);
+
+    await this.startDaemon(tokenResult.result!, userInfo.username);
   }
 
   private saveToken(userDaemon: IUserDaemon) {
diff --git a/src/interfaces/runtimes/ILoginAppRuntime.ts b/src/interfaces/runtimes/ILoginAppRuntime.ts
index 566e665c..42c1a288 100644
--- a/src/interfaces/runtimes/ILoginAppRuntime.ts
+++ b/src/interfaces/runtimes/ILoginAppRuntime.ts
@@ -28,7 +28,7 @@ export interface ILoginAppRuntime extends IAppProcess {
   logoff(userDaemon: IUserDaemon): Promise<void>;
   shutdown(userDaemon?: IUserDaemon): Promise<void>;
   restart(userDaemon?: IUserDaemon): Promise<void>;
-  proceed(username: string, password: string): Promise<void>;
+  proceed(identifier: string, password: string): Promise<void>;
 
   resetCookies(): void;
   firstRun(daemon: IUserDaemon): Promise<void>;
diff --git a/src/ts/user/auth.ts b/src/ts/user/auth.ts
index 12f5a036..ab0a4193 100644
--- a/src/ts/user/auth.ts
+++ b/src/ts/user/auth.ts
@@ -19,7 +19,7 @@ export async function LoginUser(identity: string, password: string): Promise<ICo
       })
     );
 
-    if (response.status !== 200) return CommandResult.Error(response.data?.e ?? "Username or password is incorrect");
+    if (response.status !== 200) return CommandResult.Error(response.data?.e ?? "Username/Email or password is incorrect");
 
     return CommandResult.Ok(response.data.token);
   } catch (e) {