diff --git a/website/client/components/auth/registerLogin.vue b/website/client/components/auth/registerLogin.vue
index 55dc6bd9da..87825af9ef 100644
--- a/website/client/components/auth/registerLogin.vue
+++ b/website/client/components/auth/registerLogin.vue
@@ -17,10 +17,13 @@
       .col-6
         .btn.btn-secondary.social-button(@click='socialAuth("google")', v-once)
           .svg-icon.social-icon(v-html="icons.googleIcon")
-          .text {{this.registering ? $t('signUpWithSocial', {social: 'Google'}) : $t('loginWithSocial', {social: 'Google'})}}
-    .form-group
+          span {{this.registering ? $t('signUpWithSocial', {social: 'Google'}) : $t('loginWithSocial', {social: 'Google'})}}
+    .form-group(v-if='registering')
       label(for='usernameInput', v-once) {{$t('username')}}
       input#usernameInput.form-control(type='text', :placeholder='$t("usernamePlaceholder")', v-model='username')
+    .form-group(v-if='!registering')
+      label(for='usernameInput', v-once) {{$t('emailOrUsername')}}
+      input#usernameInput.form-control(type='text', :placeholder='$t("emailPlaceholder")', v-model='username')
     .form-group(v-if='registering')
       label(for='emailInput', v-once) {{$t('email')}}
       input#emailInput.form-control(type='email', :placeholder='$t("emailPlaceholder")', v-model='email')
@@ -33,10 +36,10 @@
       small.form-text(v-once, v-html="$t('termsAndAgreement')")
     .text-center
       .btn.btn-info(@click='register()', v-if='registering', v-once) {{$t('joinHabitica')}}
-      .btn.btn-info(@click='login()', v-if='!registering', v-once) {{$t('alreadyHaveAccountLogin')}}
+      .btn.btn-info(@click='login()', v-if='!registering', v-once) {{$t('login')}}
       .toggle-links
         router-link(:to="{name: 'login'}", v-if='registering', exact)
-          a.toggle-link(v-once) {{ $t('login') }}
+          a.toggle-link(v-once) {{ $t('alreadyHaveAccountLogin') }}
         router-link(:to="{name: 'register'}",  v-if='!registering', exact)
           a.toggle-link(v-once) Don't have an account? Join Habitica!
 
diff --git a/website/common/locales/en/front.json b/website/common/locales/en/front.json
index bb67363a7c..63f2b4f5b0 100644
--- a/website/common/locales/en/front.json
+++ b/website/common/locales/en/front.json
@@ -189,7 +189,8 @@
     "unlockByline2": "Unlock new motivational tools, such as pet collecting, random rewards, spell-casting, and more!",
     "unlockHeadline": "As you stay productive, you unlock new content!",
     "useUUID": "Use UUID / API Token (For Facebook Users)",
-    "username": "Username",
+    "username": "Login Name",
+    "emailOrUsername": "Email or Login Name",
     "watchVideos": "Watch Videos",
     "work": "Work",
     "zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
diff --git a/website/common/locales/en/newClient.json b/website/common/locales/en/newClient.json
index c5e37ab85a..96c4035cbf 100644
--- a/website/common/locales/en/newClient.json
+++ b/website/common/locales/en/newClient.json
@@ -121,7 +121,7 @@
   "loginWithSocial": "Login with <%= social %>",
   "confirmPassword": "Confirm Password",
   "usernamePlaceholder": "e.g., HabitRabbit",
-  "emailPlaceholder": "e.g., rabbit@habitica.com",
+  "emailPlaceholder": "e.g., rabbit@example.com",
   "passwordPlaceholder": "e.g., •••••••••••• ",
   "confirmPasswordPlaceholder": "Make sure it’s the same password!",
   "termsAndAgreement": "By clicking the button below, you are indicating that you have read and agree to the <a href='/static/terms'>Terms of Service</a> and <a href='/static/privacy'>Privacy Policy</a>.",