diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 7f58a11e7385..191cb5de6764 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -326,8 +326,8 @@ hi_user_x = Hi %s,
activate_account = Please activate your account
activate_account.title = %s, please activate your account
-activate_account.test_1 = Hi %[1]s, thanks for registering at %[2]s!
-activate_account.test_2 = Please click the following link to activate your account within %s:
+activate_account.text_1 = Hi %[1]s, thanks for registering at %[2]s!
+activate_account.text_2 = Please click the following link to activate your account within %s:
activate_email = Verify your email address
activate_email.title = %s, please verify your e-mail address
diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl
index 1f0204157895..ad34d9eebe9e 100644
--- a/templates/mail/auth/activate.tmpl
+++ b/templates/mail/auth/activate.tmpl
@@ -7,9 +7,9 @@
{{ $activate_url := printf "%suser/activate?code=%s" AppUrl .Code}}
- {{.i18n.Tr "mail.activate_account.test_1" .DisplayName AppName | Str2html}}
- {{.i18n.Tr "mail.activate_account.test_2" .ActiveCodeLives | Str2html}}
{{$activate_url}}
- {{.i18n.Tr "mail.link_not_working_do_paste" .DisplayName AppName | Str2html}}
+ {{.i18n.Tr "mail.activate_account.text_1" .DisplayName AppName | Str2html}}
+ {{.i18n.Tr "mail.activate_account.text_2" .ActiveCodeLives | Str2html}}
{{$activate_url}}
+ {{.i18n.Tr "mail.link_not_working_do_paste"}}
© {{AppName}}
diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl
index 27cff3ba4c51..6a8de5011207 100644
--- a/templates/mail/auth/activate_email.tmpl
+++ b/templates/mail/auth/activate_email.tmpl
@@ -9,7 +9,7 @@
{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}
{{.i18n.Tr "mail.activate_email.text" .ActiveCodeLives | Str2html}}
{{$activate_url}}
- {{.i18n.Tr "mail.link_not_working_do_paste" .DisplayName AppName | Str2html}}
+ {{.i18n.Tr "mail.link_not_working_do_paste"}}
© {{AppName}}