diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index e7af934493..d852991b9c 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -255,7 +255,7 @@ module.exports = React.createClass({
                 <div className="mx_Login_error">{this.state.errorText}</div>
                 {busySpinner}
                 <ServerConfig ref="serverConfig"
-                    withToggleButton={true}
+                    withToggleButton={ this.registerLogic.getStep() === "Register.START" }
                     customHsUrl={this.props.customHsUrl}
                     customIsUrl={this.props.customIsUrl}
                     defaultHsUrl={this.props.defaultHsUrl}
diff --git a/src/components/views/login/ServerConfig.js b/src/components/views/login/ServerConfig.js
index 634bb4aac2..a18cfbbcef 100644
--- a/src/components/views/login/ServerConfig.js
+++ b/src/components/views/login/ServerConfig.js
@@ -151,6 +151,7 @@ module.exports = React.createClass({
                     </label>
                     <input className="mx_Login_field" id="hsurl" type="text"
                         placeholder={this.props.defaultHsUrl}
+                        disabled={!this.props.withToggleButton}
                         value={this.state.hs_url}
                         onChange={this.onHomeserverChanged} />
                     <label className="mx_Login_label mx_ServerConfig_islabel" htmlFor="isurl">
@@ -158,6 +159,7 @@ module.exports = React.createClass({
                     </label>
                     <input className="mx_Login_field" id="isurl" type="text"
                         placeholder={this.props.defaultIsUrl}
+                        disabled={!this.props.withToggleButton}
                         value={this.state.is_url}
                         onChange={this.onIdentityServerChanged} />
                     <a className="mx_ServerConfig_help" href="#" onClick={this.showHelpPopup}>