diff --git a/libs/auth/src/angular/registration/registration-start/registration-start.component.html b/libs/auth/src/angular/registration/registration-start/registration-start.component.html
index 53347258395..d4298504fce 100644
--- a/libs/auth/src/angular/registration/registration-start/registration-start.component.html
+++ b/libs/auth/src/angular/registration/registration-start/registration-start.component.html
@@ -12,7 +12,6 @@
         type="email"
         formControlName="email"
         [attr.readonly]="emailReadonly ? true : null"
-        appAutofocus
       />
     </bit-form-field>
 
@@ -86,8 +85,8 @@
       id="check_your_email_heading"
       class="tw-font-bold tw-mb-3 tw-text-main"
       tabindex="0"
-      appAutofocus
       aria-describedby="follow_the_link_body"
+      appAutofocus
     >
       {{ "checkYourEmail" | i18n }}
     </h2>
diff --git a/libs/auth/src/angular/registration/registration-start/registration-start.component.ts b/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
index 00baeb71072..141bff11525 100644
--- a/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
+++ b/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
@@ -127,9 +127,12 @@ export class RegistrationStartComponent implements OnInit, OnDestroy {
       return;
     }
 
+    // The app expects null for name and not empty string.
+    const sanitizedName = this.name.value === "" ? null : this.name.value;
+
     const request: RegisterSendVerificationEmailRequest = new RegisterSendVerificationEmailRequest(
       this.email.value,
-      this.name.value,
+      sanitizedName,
       this.receiveMarketingEmails.value,
     );