diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 8917f0535e..0336dc99d5 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -588,13 +588,6 @@ module.exports = React.createClass({
     _onLoadCompleted: function() {
         this.props.onLoadCompleted();
         this.setState({loading: false});
-
-        // set up the right theme.
-        // XXX: this will temporarily flicker the wrong CSS.
-        dis.dispatch({
-            action: 'set_theme',
-            value: UserSettingsStore.getSyncedSetting('theme')
-        });
     },
 
     /**
@@ -730,6 +723,16 @@ module.exports = React.createClass({
                 action: 'logout'
             });
         });
+        cli.on("accountData", function(ev) {
+            if (ev.getType() === 'im.vector.web.settings') {
+                if (ev.getContent() && ev.getContent().theme) {
+                    dis.dispatch({
+                        action: 'set_theme',
+                        value: ev.getContent().theme,
+                    });
+                }
+            }
+        });
     },
 
     onFocus: function(ev) {
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 5ce9ab1a15..498acc1917 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -605,7 +605,7 @@ module.exports = React.createClass({
                         <label htmlFor={id}>{this.nameForMedium(val.medium)}</label>
                     </div>
                     <div className="mx_UserSettings_profileInputCell">
-                        <input key={val.address} id={id} value={val.address} disabled />
+                        <input type="text" key={val.address} id={id} value={val.address} disabled />
                     </div>
                     <div className="mx_UserSettings_threepidButton">
                         <img src="img/icon_context_delete.svg" width="14" height="14" alt="Remove" onClick={this.onRemoveThreepidClicked.bind(this, val)} />