diff --git a/src/angular/components/register.component.ts b/src/angular/components/register.component.ts
index d8aedf0e0b..7ed96d4144 100644
--- a/src/angular/components/register.component.ts
+++ b/src/angular/components/register.component.ts
@@ -58,7 +58,7 @@ export class RegisterComponent {
         }
 
         this.name = this.name === '' ? null : this.name;
-        this.email = this.email.toLowerCase();
+        this.email = this.email.trim().toLowerCase();
         const kdf = KdfType.PBKDF2_SHA256;
         const kdfIterations = 5000;
         const key = await this.cryptoService.makeKey(this.masterPassword, this.email, kdf, kdfIterations);
diff --git a/src/services/auth.service.ts b/src/services/auth.service.ts
index 5a4227f8b4..d1336ed421 100644
--- a/src/services/auth.service.ts
+++ b/src/services/auth.service.ts
@@ -199,7 +199,7 @@ export class AuthService {
     }
 
     async makePreloginKey(masterPassword: string, email: string): Promise<SymmetricCryptoKey> {
-        email = email.toLowerCase();
+        email = email.trim().toLowerCase();
         this.kdf = null;
         this.kdfIterations = null;
         try {