diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 342680e8da..b3d2e92155 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -763,9 +763,9 @@ module.exports = React.createClass({
         return (
             <div className="mx_UserSettings_toggle" key={setting.id}>
                 <SettingsFlag name={setting.id}
-                                  label={setting.label}
-                                  level={SettingLevel.DEVICE}
-                                  onChange={setting.fn} />
+                              label={setting.label}
+                              level={SettingLevel.DEVICE}
+                              onChange={setting.fn} />
             </div>
         );
     },
diff --git a/src/components/views/elements/SettingsFlag.js b/src/components/views/elements/SettingsFlag.js
index 3640b5538e..cb6a001cf4 100644
--- a/src/components/views/elements/SettingsFlag.js
+++ b/src/components/views/elements/SettingsFlag.js
@@ -54,12 +54,12 @@ module.exports = React.createClass({
         if (this.props.onChange) this.props.onChange(newState);
     },
 
-    save: function(val = null) {
+    save: function(val = undefined) {
         return SettingsStore.setValue(
             this.props.name,
             this.props.roomId,
             this.props.level,
-            val ? val : this.state.value
+            val !== undefined ? val : this.state.value
         );
     },