diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index df03e8d9dc5..14d332993cd 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -493,12 +493,12 @@ en:
 
     login:
       title: "Sign In"
-      username: "Login"
+      username: "User"
       password: "Password"
       email_placeholder: "email or username"
       error: "Unknown error"
       reset_password: 'Reset Password'
-      logging_in: "Logging In..."
+      logging_in: "Signing In..."
       or: "Or"
       authenticating: "Authenticating..."
       awaiting_confirmation: "Your account is awaiting activation, use the forgot password link to issue another activation email."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 37ea4777329..41bf6e02361 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1199,9 +1199,9 @@ en:
 
         We've automatically generated a username for you: **%{username}**, but you can change that any time by visiting [your user profile][prefs].
 
-        To log in again, either:
+        To sign in again, either:
 
-        1. Log in however you like -- but that login must resolve to the **same email address** that you received your original invitation email at. Otherwise we won't be able to tell it is you!
+        1. Sign in however you like -- but that login must resolve to the **same email address** that you received your original invitation email at. Otherwise we won't be able to tell it is you!
 
         2. Create a unique password for %{site_name} on [your user profile][prefs], then log in with that.