diff --git a/skins/base/css/templates/Login.css b/skins/base/css/templates/Login.css
index b8cab4a49a..fe5646f9d3 100644
--- a/skins/base/css/templates/Login.css
+++ b/skins/base/css/templates/Login.css
@@ -70,7 +70,7 @@ limitations under the License.
     opacity: 0.8;
 }
 
-.mx_Login_advanced_checkbox {
+.mx_Login_checkbox {
     margin-right: 10px;
 }
 
diff --git a/skins/base/views/templates/Login.js b/skins/base/views/templates/Login.js
index ee7273b808..ee6bd4ed1a 100644
--- a/skins/base/views/templates/Login.js
+++ b/skins/base/views/templates/Login.js
@@ -106,12 +106,10 @@ module.exports = React.createClass({
         switch (step) {
             case 'choose_hs':
                 var serverConfigStyle = {};
-                if (!this.state.serverConfigVisible) {
-                    serverConfigStyle.display = 'none';
-                }
+                serverConfigStyle.display = this.state.serverConfigVisible ? 'block' : 'none';
                 return (
                     <div>
-                        <input className="mx_Login_advanced_checkbox" id="advanced" type="checkbox" value={this.state.serverConfigVisible} onChange={this.onServerConfigVisibleChange} />
+                        <input className="mx_Login_checkbox" id="advanced" type="checkbox" value={this.state.serverConfigVisible} onChange={this.onServerConfigVisibleChange} />
                         <label className="mx_Login_label" htmlFor="advanced">Use custom server options (advanced)</label>
                         <div style={serverConfigStyle}>
                             <ServerConfig ref="serverConfig"
diff --git a/skins/base/views/templates/Register.js b/skins/base/views/templates/Register.js
index 866f777be5..a089f78028 100644
--- a/skins/base/views/templates/Register.js
+++ b/skins/base/views/templates/Register.js
@@ -76,6 +76,7 @@ module.exports = React.createClass({
     },
 
     getUserIdSuffix: function() {
+        return '';
         var actualHsUrl = document.createElement('a');
         actualHsUrl.href = this.getHsUrl();
         var defaultHsUrl = document.createElement('a');
@@ -96,26 +97,24 @@ module.exports = React.createClass({
         switch (step) {
             case 'initial':
                 var serverConfigStyle = {};
-                if (!this.state.serverConfigVisible) {
-                    serverConfigStyle.display = 'none';
-                }
+                serverConfigStyle.display = this.state.serverConfigVisible ? 'block' : 'none';
                 return (
                     <div>
                         <form onSubmit={this.onInitialStageSubmit}>
-                        Email: <input type="text" ref="email" defaultValue={this.savedParams.email} /><br />
-                        Username: <input type="text" ref="username" defaultValue={this.savedParams.username} />{this.getUserIdSuffix()}<br />
-                        Password: <input type="password" ref="password" defaultValue={this.savedParams.password} /><br />
-                        Confirm Password: <input type="password" ref="confirmPassword" defaultValue={this.savedParams.confirmPassword} /><br />
+                        <input className="mx_Login_field" type="text" ref="email" placeholder="Email address" defaultValue={this.savedParams.email} /><br />
+                        <input className="mx_Login_field" type="text" ref="username" placeholder="User name" defaultValue={this.savedParams.username} />{this.getUserIdSuffix()}<br />
+                        <input className="mx_Login_field" type="password" ref="password" placeholder="Password" defaultValue={this.savedParams.password} /><br />
+                        <input className="mx_Login_field" type="password" ref="confirmPassword" placeholder="Confirm password" defaultValue={this.savedParams.confirmPassword} /><br />
 
-                        <input type="checkbox" value={this.state.serverConfigVisible} onChange={this.onServerConfigVisibleChange} />
-                        Use custom server options (advanced)
+                        <input className="mx_Login_checkbox" id="advanced" type="checkbox" value={this.state.serverConfigVisible} onChange={this.onServerConfigVisibleChange} />
+                        <label for="advanced">Use custom server options (advanced)</label>
                         <div style={serverConfigStyle}>
                         <ServerConfig ref="serverConfig"
                             defaultHsUrl={this.customHsUrl} defaultIsUrl={this.customIsUrl}
                             onHsUrlChanged={this.onServerUrlChanged} onIsUrlChanged={this.onServerUrlChanged} />
                         </div>
                         <br />
-                        <input type="submit" value="Continue" />
+                        <input className="mx_Login_submit" type="submit" value="Register" />
                         </form>
                     </div>
                 );
@@ -144,10 +143,10 @@ module.exports = React.createClass({
         } else {
             return (
                 <div>
-                    <h1>Create an account</h1>
+                    <h2>Create an account</h2>
                     {this.componentForStep(this.state.step)}
-                    <div className="error">{this.state.errorText}</div>
-                    <a onClick={this.showLogin} href="#">I already have an account</a>
+                    <div className="mx_Login_error">{this.state.errorText}</div>
+                    <a className="mx_Login_create" onClick={this.showLogin} href="#">I already have an account</a>
                 </div>
             );
         }