diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 935fd4f518..bfeeaafa42 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -283,8 +283,8 @@ module.exports = React.createClass({
         }
 
         const emailPlaceholder = this._authStepIsRequired('m.login.email.identity') ?
-            _t("Email address") :
-            _t("Email address (optional)");
+            _t("Email") :
+            _t("Email (optional)");
 
         const emailSection = (
             <div>
@@ -301,8 +301,8 @@ module.exports = React.createClass({
         let phoneSection;
         if (!SdkConfig.get().disable_3pid_login) {
             const phonePlaceholder = this._authStepIsRequired('m.login.msisdn') ?
-                _t("Mobile phone number") :
-                _t("Mobile phone number (optional)");
+                _t("Phone") :
+                _t("Phone (optional)");
             phoneSection = (
                 <div className="mx_Login_phoneSection">
                     <CountryDropdown ref="phone_country" onOptionChange={this._onPhoneCountryChange}
@@ -352,7 +352,7 @@ module.exports = React.createClass({
                             onBlur={function() {self.validateField(FIELD_PASSWORD);}}
                             placeholder={_t("Password")} defaultValue={this.props.defaultPassword} />
                         <input type="password" ref="passwordConfirm"
-                            placeholder={_t("Confirm password")}
+                            placeholder={_t("Confirm")}
                             className={this._classForField(FIELD_PASSWORD_CONFIRM, 'mx_Login_field')}
                             onBlur={function() {self.validateField(FIELD_PASSWORD_CONFIRM);}}
                             defaultValue={this.props.defaultPassword} />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c90e368082..0bc2cb0016 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1202,8 +1202,10 @@
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
     "Create your account": "Create your account",
     "Create your %(serverName)s account": "Create your %(serverName)s account",
-    "Email address (optional)": "Email address (optional)",
-    "Mobile phone number (optional)": "Mobile phone number (optional)",
+    "Email": "Email",
+    "Email (optional)": "Email (optional)",
+    "Phone (optional)": "Phone (optional)",
+    "Confirm": "Confirm",
     "Other servers": "Other servers",
     "Enter custom server URLs <a>What does this mean?</a>": "Enter custom server URLs <a>What does this mean?</a>",
     "Homeserver URL": "Homeserver URL",
@@ -1364,7 +1366,6 @@
     "Desktop specific": "Desktop specific",
     "Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.",
     "VoIP": "VoIP",
-    "Email": "Email",
     "Add email address": "Add email address",
     "Display name": "Display name",
     "To return to your account in future you need to set a password": "To return to your account in future you need to set a password",