diff --git a/internal/ui/login/static/i18n/en.yaml b/internal/ui/login/static/i18n/en.yaml
index 2322f3e0a2..18a759d17b 100644
--- a/internal/ui/login/static/i18n/en.yaml
+++ b/internal/ui/login/static/i18n/en.yaml
@@ -133,7 +133,7 @@ EmailVerificationDone:
   Title: E-Mail Verification
   Description: Your email address has been successfully verified.
 
-RegistrationOption:
+RegisterOption:
   Title: Registration Options
   Description: Choose how you'd like to register
   RegisterUsernamePassword: With username password
diff --git a/internal/ui/login/static/templates/register.html b/internal/ui/login/static/templates/register.html
index 7b5e874349..22b00471a0 100644
--- a/internal/ui/login/static/templates/register.html
+++ b/internal/ui/login/static/templates/register.html
@@ -18,7 +18,7 @@
             <div class="lgn-field">
                 <label class="lgn-label" for="firstname">{{t "Registration.Firstname"}}</label>
                 <input class="lgn-input" type="text" id="firstname" name="firstname" autocomplete="given-name"
-                    value="{{ .Firstname }}" required>
+                    value="{{ .Firstname }}" autofocus required>
             </div>
             <div class="lgn-field">
                 <label class="lgn-label" for="lastname">{{t "Registration.Lastname"}}</label>
@@ -29,8 +29,7 @@
 
         <div class="lgn-field double">
             <label class="lgn-label" for="email">{{t "Registration.Email"}}</label>
-            <input class="lgn-input" type="text" id="email" name="email" autocomplete="email" value="{{ .Email }}"
-                autofocus required>
+            <input class="lgn-input" type="text" id="email" name="email" autocomplete="email" value="{{ .Email }}" required>
         </div>
 
         <div class="double-col">