diff --git a/internal/api/ui/login/static/i18n/de.yaml b/internal/api/ui/login/static/i18n/de.yaml
index 05fd853b8..a142a2637 100644
--- a/internal/api/ui/login/static/i18n/de.yaml
+++ b/internal/api/ui/login/static/i18n/de.yaml
@@ -67,7 +67,7 @@ InitUser:
   Description: Du hast einen Code erhalten, welcher im untenstehenden Formular eingegeben werden muss um deine E-Mail zu verifizieren und ein neues Passwort zu setzen.
   CodeLabel: Code
   NewPasswordLabel: Neues Passwort
-  NewPasswordConfirmLabel: Passwort bestätigen
+  NewPasswordConfirm: Passwort bestätigen
   NextButtonText: weiter
   ResendButtonText: erneut senden
 
@@ -239,6 +239,7 @@ ExternalRegistrationUserOverview:
   English: English
   Italian: Italiano
   French: Français
+  Chinese: 简体中文
   TosAndPrivacyLabel: Allgemeine Geschäftsbedingungen und Datenschutz
   TosConfirm: Ich akzeptiere die
   TosLinkText: AGBs
@@ -282,7 +283,7 @@ LinkingUsersDone:
   CancelButtonText: abbrechen
   NextButtonText: weiter
 
-ExternalNotFoundOption:
+ExternalNotFound:
   Title: Externer Benutzer
   Description: Externer Benutzer konnte nicht gefunden werden. Willst du deinen Benutzer mit einem bestehenden verlinken oder diesen als neuen Benutzer registrieren.
   LinkButtonText: Verlinken
@@ -296,6 +297,7 @@ ExternalNotFoundOption:
   English: English
   Italian: Italiano
   French: Français
+  Chinese: 简体中文
 
 Footer:
   PoweredBy: Powered By
diff --git a/internal/api/ui/login/static/i18n/en.yaml b/internal/api/ui/login/static/i18n/en.yaml
index 8fad694df..4e22036fc 100644
--- a/internal/api/ui/login/static/i18n/en.yaml
+++ b/internal/api/ui/login/static/i18n/en.yaml
@@ -67,7 +67,7 @@ InitUser:
   Description: You have received a code, which you have to enter in the form below, to verify your email and set your new password.
   CodeLabel: Code
   NewPasswordLabel: New Password
-  NewPasswordConfirmLabel: Confirm Password
+  NewPasswordConfirm: Confirm Password
   NextButtonText: next
   ResendButtonText: resend
 
@@ -239,6 +239,7 @@ ExternalRegistrationUserOverview:
   English: English
   Italian: Italiano
   French: Français
+  Chinese: 简体中文
   TosAndPrivacyLabel: Terms and conditions
   TosConfirm: I accept the
   TosLinkText: TOS
@@ -282,7 +283,7 @@ LinkingUsersDone:
   CancelButtonText: cancel
   NextButtonText: next
 
-ExternalNotFoundOption:
+ExternalNotFound:
   Title: External User
   Description: External user not found. Do you want to link your user or auto register a new one.
   LinkButtonText: Link
@@ -296,6 +297,7 @@ ExternalNotFoundOption:
   English: English
   Italian: Italiano
   French: Français
+  Chinese: 简体中文
 
 Footer:
   PoweredBy: Powered By
diff --git a/internal/api/ui/login/static/i18n/fr.yaml b/internal/api/ui/login/static/i18n/fr.yaml
index 6943ba59d..81a0dabed 100644
--- a/internal/api/ui/login/static/i18n/fr.yaml
+++ b/internal/api/ui/login/static/i18n/fr.yaml
@@ -67,7 +67,7 @@ InitUser:
   Description: Vous avez reçu un code, que vous devez entrer dans le formulaire ci-dessous, pour vérifier votre e-mail et définir votre nouveau mot de passe.
   CodeLabel: Code
   NewPasswordLabel: Nouveau mot de passe
-  NewPasswordConfirmLabel: Confirmer le mot de passe
+  NewPasswordConfirm: Confirmer le mot de passe
   NextButtonText: Suivant
   ResendButtonText: envoyer à nouveau
 
@@ -239,6 +239,7 @@ ExternalRegistrationUserOverview:
   English: English
   Italian: Italiano
   French: Français
+  Chinese: 简体中文
   TosAndPrivacyLabel: Termes et conditions
   TosConfirm: J'accepte les
   TosLinkText: TOS
@@ -282,7 +283,7 @@ LinkingUsersDone:
   CancelButtonText: annuler
   NextButtonText: suivant
 
-ExternalNotFoundOption:
+ExternalNotFound:
   Title: Utilisateur externe
   Description: Utilisateur externe non trouvé. Voulez-vous lier votre utilisateur ou enregistrer automatiquement un nouvel utilisateur.
   LinkButtonText: Lier
@@ -296,6 +297,7 @@ ExternalNotFoundOption:
   English: English
   Italian: Italiano
   French: Français
+  Chinese: 简体中文
 
 Footer:
   PoweredBy: Promulgué par
diff --git a/internal/api/ui/login/static/i18n/it.yaml b/internal/api/ui/login/static/i18n/it.yaml
index b4d56f043..52e01d972 100644
--- a/internal/api/ui/login/static/i18n/it.yaml
+++ b/internal/api/ui/login/static/i18n/it.yaml
@@ -67,7 +67,7 @@ InitUser:
   Description: Hai ricevuto un codice, che devi inserire nel modulo sottostante, per verificare la tua email e impostare la tua nuova password.
   CodeLabel: Codice
   NewPasswordLabel: Nuova password
-  NewPasswordConfirmLabel: Conferma la password
+  NewPasswordConfirm: Conferma la password
   NextButtonText: Avanti
   ResendButtonText: rispedisci
 
@@ -209,9 +209,9 @@ RegistrationUser:
   English: English
   Italian: Italiano
   French: Français
+  Chinese: 简体中文
   GenderLabel: Genere
   Female: Femminile
-  Chinese: 简体中文
   Male: Maschile
   Diverse: diverso / X
   PasswordLabel: Password
@@ -239,6 +239,7 @@ ExternalRegistrationUserOverview:
   English: English
   Italian: Italiano
   French: Français
+  Chinese: 简体中文
   TosAndPrivacyLabel: Termini di servizio
   TosConfirm: Accetto i
   TosLinkText: Termini di servizio
@@ -282,7 +283,7 @@ LinkingUsersDone:
   CancelButtonText: annulla
   NextButtonText: Avanti
 
-ExternalNotFoundOption:
+ExternalNotFound:
   Title: Utente esterno
   Description: Utente esterno non trovato. Vuoi collegare il tuo utente o registrarne uno nuovo automaticamente.
   LinkButtonText: Link
@@ -296,6 +297,7 @@ ExternalNotFoundOption:
   English: English
   Italian: Italiano
   French: Français
+  Chinese: 简体中文
 
 Footer:
   PoweredBy: Alimentato da
diff --git a/internal/api/ui/login/static/i18n/zh.yaml b/internal/api/ui/login/static/i18n/zh.yaml
index 4e626681d..819b6f618 100644
--- a/internal/api/ui/login/static/i18n/zh.yaml
+++ b/internal/api/ui/login/static/i18n/zh.yaml
@@ -67,7 +67,7 @@ InitUser:
   Description: 您将收到一个验证码，您必须在下面输入该验证码，以验证您的电子邮件并设置您的新密码。
   CodeLabel: 验证码
   NewPasswordLabel: 新密码
-  NewPasswordConfirmLabel: 确认密码
+  NewPasswordConfirm: 确认密码
   NextButtonText: 继续
   ResendButtonText: 重新发送
 
@@ -283,7 +283,7 @@ LinkingUsersDone:
   CancelButtonText: 取消
   NextButtonText: 继续
 
-ExternalNotFoundOption:
+ExternalNotFound:
   Title: 外部用户
   Description: 未找到外部用户。你想绑定你已存在的用户还是自动注册一个新用户。
   LinkButtonText: 绑定
@@ -293,10 +293,10 @@ ExternalNotFoundOption:
   TosLinkText: 服务条款
   TosConfirmAnd: 和
   PrivacyLinkText: 隐私政策
-  German: 德语
-  English: 英语
-  Italian: 意大利语
-  French: 法语
+  German: Deutsch
+  English: English
+  Italian: Italiano
+  French: Français
   Chinese: 简体中文
 
 Footer:
diff --git a/internal/api/ui/login/static/templates/external_not_found_option.html b/internal/api/ui/login/static/templates/external_not_found_option.html
index 3a7ef355d..38dfc6c54 100644
--- a/internal/api/ui/login/static/templates/external_not_found_option.html
+++ b/internal/api/ui/login/static/templates/external_not_found_option.html
@@ -1,8 +1,8 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
-    <h1>{{t "ExternalNotFoundOption.Title"}}</h1>
-    <p>{{t "ExternalNotFoundOption.Description"}}</p>
+    <h1>{{t "ExternalNotFound.Title"}}</h1>
+    <p>{{t "ExternalNotFound.Description"}}</p>
 
 </div>
 
@@ -60,13 +60,15 @@
                 <label class="lgn-label" for="languages">{{t "ExternalRegistrationUserOverview.LanguageLabel"}}</label>
                 <select id="languages" name="language">
                     <option value=""></option>
-                    <option value="de" id="de" {{if (selectedLanguage "de")}} selected {{end}}>{{t "ExternalNotFoundOption.German"}}
+                    <option value="de" id="de" {{if (selectedLanguage "de")}} selected {{end}}>{{t "ExternalNotFound.German"}}
                     </option>
-                    <option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "ExternalNotFoundOption.English"}}
+                    <option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "ExternalNotFound.English"}}
                     </option>
-                    <option value="it" id="it" {{if (selectedLanguage "it")}} selected {{end}}>{{t "ExternalNotFoundOption.Italian"}}
+                    <option value="it" id="it" {{if (selectedLanguage "it")}} selected {{end}}>{{t "ExternalNotFound.Italian"}}
                     </option>
-                    <option value="fr" id="fr" {{if (selectedLanguage "fr")}} selected {{end}}>{{t "ExternalNotFoundOption.French"}}
+                    <option value="fr" id="fr" {{if (selectedLanguage "fr")}} selected {{end}}>{{t "ExternalNotFound.French"}}
+                    </option>
+                    <option value="zh" id="zh" {{if (selectedLanguage "zh")}} selected {{end}}>{{t "ExternalNotFound.Chinese"}}
                     </option>
                 </select>
             </div>
@@ -74,23 +76,23 @@
 
         {{ if or .TOSLink .PrivacyLink }}
         <div class="lgn-field">
-            <label class="lgn-label">{{t "ExternalNotFoundOption.TosAndPrivacyLabel"}}</label>
+            <label class="lgn-label">{{t "ExternalNotFound.TosAndPrivacyLabel"}}</label>
             <div class="lgn-checkbox">
                 <input type="checkbox" id="terms-confirm"
                        name="terms-confirm" required>
                 <label for="terms-confirm">
-                    {{t "ExternalNotFoundOption.TosConfirm"}}
+                    {{t "ExternalNotFound.TosConfirm"}}
                     {{ if .TOSLink }}
                     <a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
-                        {{t "ExternalNotFoundOption.TosLinkText"}}
+                        {{t "ExternalNotFound.TosLinkText"}}
                     </a>
                     {{end}}
                     {{ if and .TOSLink .PrivacyLink }}
-                    {{t "ExternalNotFoundOption.TosConfirmAnd"}}
+                    {{t "ExternalNotFound.TosConfirmAnd"}}
                     {{ end }}
                     {{ if .PrivacyLink }}
                     <a class="tos-link" target="_blank" href="{{ .PrivacyLink}}" rel="noopener noreferrer">
-                        {{t "ExternalNotFoundOption.PrivacyLinkText"}}
+                        {{t "ExternalNotFound.PrivacyLinkText"}}
                     </a>
                     {{end}}
                 </label>
@@ -108,11 +110,11 @@
         </button>
 
         <button type="submit" formaction="{{ externalNotFoundOptionUrl "linkbutton"}}" class="lgn-raised-button lgn-primary" name="linkbutton" value="true">
-            {{t "ExternalNotFoundOption.LinkButtonText"}}
+            {{t "ExternalNotFound.LinkButtonText"}}
         </button>
             <span class="fill-space"></span>
         <button type="submit" formaction="{{ externalNotFoundOptionUrl "autoregisterbutton"}}" class="lgn-raised-button lgn-primary" name="autoregisterbutton" value="true">
-            {{t "ExternalNotFoundOption.AutoRegisterButtonText"}}
+            {{t "ExternalNotFound.AutoRegisterButtonText"}}
         </button>
     </div>
 </form>
diff --git a/internal/api/ui/login/static/templates/external_register_overview.html b/internal/api/ui/login/static/templates/external_register_overview.html
index 1779c5ade..c5d1f2f13 100644
--- a/internal/api/ui/login/static/templates/external_register_overview.html
+++ b/internal/api/ui/login/static/templates/external_register_overview.html
@@ -68,6 +68,8 @@
                     </option>
                     <option value="fr" id="fr" {{if (selectedLanguage "fr")}} selected {{end}}>{{t "ExternalRegistrationUserOverview.French"}}
                     </option>
+                    <option value="zh" id="zh" {{if (selectedLanguage "zh")}} selected {{end}}>{{t "ExternalRegistrationUserOverview.Chinese"}}
+                    </option>
                 </select>
             </div>
         </div>
diff --git a/internal/api/ui/login/static/templates/init_password.html b/internal/api/ui/login/static/templates/init_password.html
index eea512cc8..1e3087597 100644
--- a/internal/api/ui/login/static/templates/init_password.html
+++ b/internal/api/ui/login/static/templates/init_password.html
@@ -1,10 +1,10 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
-    <h1>{{t "InitPassword.Title" }}</h1>
+    <h1>{{t "InitPassword.Title"}}</h1>
     {{ template "user-profile" . }}
 
-    <p>{{t "InitPassword.Description" }}</p>
+    <p>{{t "InitPassword.Description"}}</p>
 </div>
 
 <form action="{{ initPasswordUrl }}" method="POST">
@@ -48,7 +48,7 @@
 
         <span class="fill-space"></span>
 
-        <button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "InitPassword.ResendButtonText" }}</button>
+        <button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "InitPassword.ResendButtonText"}}</button>
     </div>
 </form>
 
diff --git a/internal/api/ui/login/static/templates/init_user.html b/internal/api/ui/login/static/templates/init_user.html
index d375dd6f1..5d92e4736 100644
--- a/internal/api/ui/login/static/templates/init_user.html
+++ b/internal/api/ui/login/static/templates/init_user.html
@@ -1,11 +1,11 @@
 {{template "main-top" .}}
 
 <div class="lgn-head">
-    <h1>{{t "InitUser.Title" }}</h1>
+    <h1>{{t "InitUser.Title"}}</h1>
 
     {{ template "user-profile" . }}
 
-    <p>{{t "InitUser.Description" }}</p>
+    <p>{{t "InitUser.Description"}}</p>
 </div>
 
 <form action="{{ initUserUrl }}" method="POST">
@@ -34,7 +34,7 @@
             {{ template "password-complexity-policy-description" . }}
         </div>
         <div class="field">
-            <label class="lgn-label" for="passwordconfirm">{{t "InitUser.NewPasswordConfirmLabel"}}</label>
+            <label class="lgn-label" for="passwordconfirm">{{t "InitUser.NewPasswordConfirm"}}</label>
             <input class="lgn-input" type="password" id="passwordconfirm" name="passwordconfirm"
                 autocomplete="new-password" autofocus required>
         </div>
@@ -54,7 +54,7 @@
 
         <span class="fill-space"></span>
 
-        <button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "InitUser.ResendButtonText" }}</button>
+        <button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "InitUser.ResendButtonText"}}</button>
     </div>
 </form>
 
diff --git a/internal/api/ui/login/static/templates/mfa_prompt.html b/internal/api/ui/login/static/templates/mfa_prompt.html
index ffe0dfc66..f8dcdf1f8 100644
--- a/internal/api/ui/login/static/templates/mfa_prompt.html
+++ b/internal/api/ui/login/static/templates/mfa_prompt.html
@@ -13,8 +13,7 @@
   <input type="hidden" name="authRequestID" value="{{ .AuthReqID }}" />
 
   <div class="fields">
-    {{ range $provider := .MFAProviders}} {{ $providerName := (t (printf
-    "InitMFAPrompt.Provider%v" $provider)) }}
+    {{ range $provider := .MFAProviders}} {{ $providerName := (t (printf "InitMFAPrompt.Provider%v" $provider)) }}
     <div class="lgn-radio block">
       <input
         id="{{ $provider }}"
diff --git a/internal/api/ui/login/static/templates/register.html b/internal/api/ui/login/static/templates/register.html
index ab82b17b4..90cd2b4ed 100644
--- a/internal/api/ui/login/static/templates/register.html
+++ b/internal/api/ui/login/static/templates/register.html
@@ -62,6 +62,8 @@
                     </option>
                     <option value="fr" id="fr" {{if (selectedLanguage "fr")}} selected {{end}}>{{t "RegistrationUser.French"}}
                     </option>
+                    <option value="zh" id="zh" {{if (selectedLanguage "zh")}} selected {{end}}>{{t "RegistrationUser.Chinese"}}
+                    </option>
                 </select>
             </div>
             <div class="lgn-field" >