diff --git a/src/angular/components/register.component.ts b/src/angular/components/register.component.ts
index a990aae0b8..ba1002d817 100644
--- a/src/angular/components/register.component.ts
+++ b/src/angular/components/register.component.ts
@@ -100,6 +100,8 @@ export class RegisterComponent {
             }
         }
 
+        this.name = this.name === '' ? null : this.name;
+        this.email = this.email.trim().toLowerCase();
         const kdf = KdfType.PBKDF2_SHA256;
         const useLowerKdf = this.platformUtilsService.isEdge() || this.platformUtilsService.isIE();
         const kdfIterations = useLowerKdf ? 10000 : 100000;