diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index 21641978b6..d0df97a8e1 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -36,6 +36,12 @@ limitations under the License.
     color: $primary-fg-color;
 }
 
+.mx_Auth_editServerDetails {
+    padding-left: 1em;
+    font-size: 12px;
+    font-weight: normal;
+}
+
 .mx_AuthBody a:link,
 .mx_AuthBody a:hover,
 .mx_AuthBody a:visited {
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 8dd21c2d5c..64d35134f1 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -360,6 +360,14 @@ module.exports = React.createClass({
         });
     },
 
+    onEditServerDetailsClick(ev) {
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.setState({
+            phase: PHASE_SERVER_DETAILS,
+        });
+    },
+
     _tryWellKnownDiscovery: async function(serverName) {
         if (!serverName.trim()) {
             // Nothing to discover
@@ -605,10 +613,20 @@ module.exports = React.createClass({
 
     _renderPasswordStep: function() {
         const PasswordLogin = sdk.getComponent('auth.PasswordLogin');
+        let onEditServerDetailsClick = null;
+        // If custom URLs are allowed and we haven't selected the Free server type, wire
+        // up the server details edit link.
+        if (
+            !SdkConfig.get()['disable_custom_urls'] &&
+            this.state.serverType !== ServerType.FREE
+        ) {
+            onEditServerDetailsClick = this.onEditServerDetailsClick;
+        }
         return (
             <PasswordLogin
                onSubmit={this.onPasswordLogin}
                onError={this.onPasswordLoginError}
+               onEditServerDetailsClick={onEditServerDetailsClick}
                initialUsername={this.state.username}
                initialPhoneCountry={this.state.phoneCountry}
                initialPhoneNumber={this.state.phoneNumber}
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index 6e35b99fdd..3dcf3acee4 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -29,6 +29,7 @@ import SdkConfig from '../../../SdkConfig';
 class PasswordLogin extends React.Component {
     static defaultProps = {
         onError: function() {},
+        onEditServerDetailsClick: null,
         onUsernameChanged: function() {},
         onUsernameBlur: function() {},
         onPasswordChanged: function() {},
@@ -261,6 +262,15 @@ class PasswordLogin extends React.Component {
             }
         }
 
+        let editLink = null;
+        if (this.props.onEditServerDetailsClick) {
+            editLink = <a className="mx_Auth_editServerDetails"
+                href="#" onClick={this.props.onEditServerDetailsClick}
+            >
+                {_t('Edit')}
+            </a>;
+        }
+
         const pwFieldClass = classNames({
             mx_Login_field: true,
             error: this.props.loginIncorrect && !this.isLoginEmpty(), // only error password if error isn't top field
@@ -289,7 +299,10 @@ class PasswordLogin extends React.Component {
 
         return (
             <div>
-                <h3>{ yourMatrixAccountText }</h3>
+                <h3>
+                    {yourMatrixAccountText}
+                    {editLink}
+                </h3>
                 <form onSubmit={this.onSubmitForm}>
                     { loginType }
                     { loginField }