diff --git a/libs/auth/src/angular/login/login.component.html b/libs/auth/src/angular/login/login.component.html
index 8ff0ba1fad5..ca4277aa203 100644
--- a/libs/auth/src/angular/login/login.component.html
+++ b/libs/auth/src/angular/login/login.component.html
@@ -25,7 +25,13 @@
     <!-- Email Address input -->
     <bit-form-field class="!tw-mb-4">
       <bit-label>{{ "emailAddress" | i18n }}</bit-label>
-      <input type="email" formControlName="email" bitInput appAutofocus />
+      <input
+        type="email"
+        formControlName="email"
+        bitInput
+        appAutofocus
+        (blur)="onEmailBlur($event)"
+      />
     </bit-form-field>
 
     <!-- Remember Email input -->
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts
index 01ff3a5eea1..9f4f98e0cb8 100644
--- a/libs/auth/src/angular/login/login.component.ts
+++ b/libs/auth/src/angular/login/login.component.ts
@@ -82,14 +82,17 @@ export class LoginComponent implements OnInit, OnDestroy {
   showLoginWithDevice = false;
   validatedEmail = false;
 
-  formGroup = this.formBuilder.group({
-    email: ["", [Validators.required, Validators.email]],
-    masterPassword: [
-      "",
-      [Validators.required, Validators.minLength(Utils.originalMinimumPasswordLength)],
-    ],
-    rememberEmail: [false],
-  });
+  formGroup = this.formBuilder.group(
+    {
+      email: ["", [Validators.required, Validators.email]],
+      masterPassword: [
+        "",
+        [Validators.required, Validators.minLength(Utils.originalMinimumPasswordLength)],
+      ],
+      rememberEmail: [false],
+    },
+    { updateOn: "submit" },
+  );
 
   get emailFormControl(): FormControl<string> {
     return this.formGroup.controls.email;
@@ -373,6 +376,15 @@ export class LoginComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Set the email value from the input field.
+   * @param event The event object from the input field.
+   */
+  onEmailBlur(event: Event) {
+    const emailInput = event.target as HTMLInputElement;
+    this.formGroup.controls.email.setValue(emailInput.value);
+  }
+
   protected async goToHint(): Promise<void> {
     await this.saveEmailSettings();
     await this.router.navigateByUrl("/hint");