diff --git a/locales/en.yml b/locales/en.yml
index 32399fd9d..083f0dbe2 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -227,6 +227,7 @@ en:
   embedlink:
     copy: "Copy to Clipboard"
   error:
+    AUTHENTICATION: "An error occurred trying to authenticate your account."
     PASSWORD_INCORRECT: "Your current password was entered incorrectly"
     COMMENT_PARENT_NOT_VISIBLE: "The comment that you're replying to has been removed or doesn't exist."
     EMAIL_VERIFICATION_TOKEN_INVALID: "Email verification token is invalid."
diff --git a/plugins/talk-plugin-ignore-user/client/translations.yml b/plugins/talk-plugin-ignore-user/client/translations.yml
index 84a4ca11c..fdf2b1daf 100644
--- a/plugins/talk-plugin-ignore-user/client/translations.yml
+++ b/plugins/talk-plugin-ignore-user/client/translations.yml
@@ -39,6 +39,7 @@ en:
     confirmation_title: Ignore {0}?
 de:
   talk-plugin-ignore-user:
+    blank_info: Sie ignorieren derzeit keine Nutzer
     section_title: Ignorierte Nutzer
     section_info: Weil Sie die folgenden Nutzer ignorieren, sind deren Kommentare versteckt.
     stop_ignoring: Ignorieren beenden
diff --git a/plugins/talk-plugin-local-auth/client/components/ChangePassword.js b/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
index 010df0826..cae112203 100644
--- a/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
+++ b/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
@@ -185,7 +185,7 @@ class ChangePassword extends React.Component {
           >
             <InputField
               id="oldPassword"
-              label="Old Password"
+              label={t('talk-plugin-local-auth.change_password.old_password')}
               name="oldPassword"
               type="password"
               onChange={this.onChange}
@@ -205,7 +205,7 @@ class ChangePassword extends React.Component {
             </InputField>
             <InputField
               id="newPassword"
-              label="New Password"
+              label={t('talk-plugin-local-auth.change_password.new_password')}
               name="newPassword"
               type="password"
               onChange={this.onChange}
@@ -216,7 +216,9 @@ class ChangePassword extends React.Component {
             />
             <InputField
               id="confirmNewPassword"
-              label="Confirm New Password"
+              label={t(
+                'talk-plugin-local-auth.change_password.confirm_new_password'
+              )}
               name="confirmNewPassword"
               type="password"
               onChange={this.onChange}
diff --git a/plugins/talk-plugin-local-auth/client/components/ChangeUsernameContentDialog.js b/plugins/talk-plugin-local-auth/client/components/ChangeUsernameContentDialog.js
index 3e7107922..3ec2385fd 100644
--- a/plugins/talk-plugin-local-auth/client/components/ChangeUsernameContentDialog.js
+++ b/plugins/talk-plugin-local-auth/client/components/ChangeUsernameContentDialog.js
@@ -65,7 +65,7 @@ class ChangeUsernameContentDialog extends React.Component {
           <form onSubmit={this.confirmChanges}>
             <InputField
               id="confirmNewUsername"
-              label="Re-enter new username"
+              label={t('talk-plugin-local-auth.change_username.re_enter')}
               name="confirmNewUsername"
               type="text"
               onChange={this.props.onChange}
diff --git a/plugins/talk-plugin-local-auth/translations.yml b/plugins/talk-plugin-local-auth/translations.yml
index 864af57a4..fa9515432 100644
--- a/plugins/talk-plugin-local-auth/translations.yml
+++ b/plugins/talk-plugin-local-auth/translations.yml
@@ -13,6 +13,9 @@ en:
       passwords_dont_match: "Passwords don`t match"
       required_field: "This field is required"
       forgot_password: "Forgot your password?"
+      old_password: "Old Password"
+      new_password: "New Password"
+      confirm_new_password: "Confirm New Password"
       save: "Save"
       cancel: "Cancel"
       edit: "Edit"
@@ -28,6 +31,7 @@ en:
       description: "You are attempting to change your username. Your new username will appear on all of your past and future comments."
       old_username: "Old Username"
       new_username: "New Username"
+      re_enter: "Re-enter new username"
       bottom_note: "Note: You will not be able to change your username again for 14 days"
       confirm_changes: "Confirm Changes"
       username_does_not_match: "Username does not match"
@@ -84,13 +88,17 @@ de:
       passwords_dont_match: "Die Passwörter stimmen nicht überein"
       required_field: "Diese Angabe ist erforderlich"
       forgot_password: "Passwort vergessen?"
+      old_password: "Altes Passwort"
+      new_password: "Neues Passwort"
+      confirm_new_password: "Neues Passwort bestätigen"
       save: "Speichern"
       cancel: "Abbrechen"
       edit: "Ändern"
       changed_password_msg: "Passwort geändert - Ihr Passwort wurde erfolgreich geändert"
       forgot_password_sent: "Passwort vergessen - Wir haben Ihnen eine E-Mail zum Zurücksetzen des Passwortes geschickt"
     change_username:
-      change_username_note: "Nutzernamen können nur alle 14 Tage geändert werden. Ihr Nutzername ist zur Zeit nicht editierbar."
+      change_username_note: "Nutzernamen können nur alle 14 Tage geändert werden."
+      is_not_eligible: "Sie können Ihren Nutzernamen derzeit nicht ändern."
       save: "Speichern"
       edit_profile: "Profil ändern"
       cancel: "Abbrechen"
@@ -98,6 +106,7 @@ de:
       description: "Sie möchten Ihren Nutzernamen ändern: der neue Nutzername wird an allen alten und neuen Kommentaren erscheinen."
       old_username: "Alter Nutzername"
       new_username: "Neuer Nutzername"
+      re_enter: "Neuen Nutzernamen bestätigen"
       bottom_note: "Achtung: die nächste Änderung des Nutzernamens ist erst nach 14 Tagen möglich"
       confirm_changes: "Änderung bestätigen"
       username_does_not_match: "Die Nutzernamen stimmen nicht überein"
diff --git a/services/mailer/templates/password-reset.txt.ejs b/services/mailer/templates/password-reset.txt.ejs
index 2b5e60a9b..577f23bec 100644
--- a/services/mailer/templates/password-reset.txt.ejs
+++ b/services/mailer/templates/password-reset.txt.ejs
@@ -1,3 +1,3 @@
-<%= t('email.password_reset.we_received_a_request') %>. <%= t('email.password_reset.if_you_did') %> <%= t('email.password_reset.please_click') %>:
+<%= t('email.password_reset.we_received_a_request') %> <%= t('email.password_reset.if_you_did') %> <%= t('email.password_reset.please_click') %>:
 
 <%= BASE_URL %>account/password/reset#<%= token %>