diff --git a/application/src/main/resources/templates/gateway_modules/form_fragments.html b/application/src/main/resources/templates/gateway_modules/form_fragments.html
index c664d37fb..1533e1cfa 100644
--- a/application/src/main/resources/templates/gateway_modules/form_fragments.html
+++ b/application/src/main/resources/templates/gateway_modules/form_fragments.html
@@ -55,9 +55,9 @@
             <span th:text="#{form.signup.error.rateLimitExceeded}"></span>
         </strong>
     </div>
-    <div class="alert alert-error" role="alert" th:if="${error == 'duplicate-name'}">
+    <div class="alert alert-error" role="alert" th:if="${error == 'duplicate-username'}">
         <strong>
-            <span th:text="#{form.signup.error.duplicateName}"></span>
+            <span th:text="#{form.signup.error.duplicateUsername}"></span>
         </strong>
     </div>
     <div class="form-item-group">
diff --git a/application/src/main/resources/templates/gateway_modules/form_fragments.properties b/application/src/main/resources/templates/gateway_modules/form_fragments.properties
index fdd436a16..48d3a835a 100644
--- a/application/src/main/resources/templates/gateway_modules/form_fragments.properties
+++ b/application/src/main/resources/templates/gateway_modules/form_fragments.properties
@@ -16,7 +16,7 @@ form.signup.password.label=密码
 form.signup.confirmPassword.label=确认密码
 form.signup.submit=注册
 form.signup.error.invalidEmailCode=无效的邮箱验证码
-form.signup.error.duplicateName=用户名已经被注册
+form.signup.error.duplicateUsername=用户名已经被注册
 form.signup.error.rateLimitExceeded=请求过于频繁，请稍后再试
 
 form.totp.messages.invalidError=错误的验证码
diff --git a/application/src/main/resources/templates/gateway_modules/form_fragments_en.properties b/application/src/main/resources/templates/gateway_modules/form_fragments_en.properties
index 63be73e23..7f63f5e6d 100644
--- a/application/src/main/resources/templates/gateway_modules/form_fragments_en.properties
+++ b/application/src/main/resources/templates/gateway_modules/form_fragments_en.properties
@@ -16,7 +16,7 @@ form.signup.password.label=Password
 form.signup.confirmPassword.label=Confirm Password
 form.signup.submit=Sign Up
 form.signup.error.invalidEmailCode=Invalid Email Verification Code
-form.signup.error.duplicateName=Username is already taken
+form.signup.error.duplicateUsername=Username is already taken
 form.signup.error.rateLimitExceeded=Too many requests, please try again later
 
 form.totp.messages.invalidError=Invalid TOTP code
diff --git a/application/src/main/resources/templates/gateway_modules/form_fragments_es.properties b/application/src/main/resources/templates/gateway_modules/form_fragments_es.properties
index 8175c046d..8dab4708d 100644
--- a/application/src/main/resources/templates/gateway_modules/form_fragments_es.properties
+++ b/application/src/main/resources/templates/gateway_modules/form_fragments_es.properties
@@ -16,7 +16,7 @@ form.signup.password.label=Contraseña
 form.signup.confirmPassword.label=Confirmar Contraseña
 form.signup.submit=Registrarse
 form.signup.error.invalidEmailCode=Código de verificación del correo inválido
-form.signup.error.duplicateName=El nombre de usuario ya está registrado
+form.signup.error.duplicateUsername=El nombre de usuario ya está registrado
 form.signup.error.rateLimitExceeded=Demasiadas solicitudes, por favor intente nuevamente más tarde
 
 form.totp.messages.invalidError=Código de verificación incorrecto
@@ -33,4 +33,4 @@ form.passwordResetLink.submit=Cambiar Contraseña
 form.passwordReset.email.label=Correo Electrónico
 form.passwordReset.submit=Enviar
 form.passwordReset.sent.submit=Volver a la Página de Inicio de Sesión
-form.passwordReset.message.success=Revisa tu correo electrónico para ver el enlace de restablecimiento de contraseña. Si no aparece en unos minutos, revisa tu carpeta de spam.
+form.passwordReset.message.success=Revisa tu correo electrónico para ver el enlace de restablecimiento de contraseña. Si no aparece en unos minutos, revisa tu carpeta de spam.
\ No newline at end of file
diff --git a/application/src/main/resources/templates/gateway_modules/form_fragments_zh_TW.properties b/application/src/main/resources/templates/gateway_modules/form_fragments_zh_TW.properties
index e4ad256f1..7accc38c1 100644
--- a/application/src/main/resources/templates/gateway_modules/form_fragments_zh_TW.properties
+++ b/application/src/main/resources/templates/gateway_modules/form_fragments_zh_TW.properties
@@ -16,7 +16,7 @@ form.signup.password.label=密碼
 form.signup.confirmPassword.label=確認密碼
 form.signup.submit=註冊
 form.signup.error.invalidEmailCode=無效的郵箱驗證碼
-form.signup.error.duplicateName=使用者名稱已經被註冊
+form.signup.error.duplicateUsername=使用者名稱已經被註冊
 form.signup.error.rateLimitExceeded=請求過於頻繁，請稍後再試
 
 form.totp.messages.invalidError=錯誤的驗證碼