diff --git a/src/IdentityAuthClient.js b/src/IdentityAuthClient.js
index 12c0c5b147..39785ef063 100644
--- a/src/IdentityAuthClient.js
+++ b/src/IdentityAuthClient.js
@@ -52,7 +52,7 @@ export default class IdentityAuthClient {
 
     _writeToken() {
         if (this.tempClient) return; // temporary client: ignore
-        window.localStorage.setItem("mx_is_access_token", token);
+        window.localStorage.setItem("mx_is_access_token", this.accessToken);
     }
 
     _readToken() {
diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index c4842d2ae9..beea3f878f 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -144,8 +144,6 @@ export default class SetIdServer extends React.Component {
         const fullUrl = unabbreviateUrl(this.state.idServer);
 
         let errStr = await checkIdentityServerUrl(fullUrl);
-
-        let newFormValue = this.state.idServer;
         if (!errStr) {
             try {
                 this.setState({checking: false}); // clear tooltip
@@ -191,7 +189,7 @@ export default class SetIdServer extends React.Component {
             checking: false,
             error: errStr,
             currentClientIdServer: MatrixClientPeg.get().getIdentityServerUrl(),
-            idServer: newFormValue,
+            idServer: this.state.idServer,
         });
     };