diff --git a/res/css/_components.scss b/res/css/_components.scss
index 0603296ef5..076516b7af 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -138,7 +138,7 @@
 @import "./views/settings/_Notifications.scss";
 @import "./views/settings/_PhoneNumbers.scss";
 @import "./views/settings/_ProfileSettings.scss";
-@import "./views/settings/tabs/_GeneralSettingsTab.scss";
+@import "./views/settings/tabs/_GeneralUserSettingsTab.scss";
 @import "./views/settings/tabs/_HelpSettingsTab.scss";
 @import "./views/settings/tabs/_PreferencesSettingsTab.scss";
 @import "./views/settings/tabs/_SecuritySettingsTab.scss";
diff --git a/res/css/views/settings/tabs/_GeneralSettingsTab.scss b/res/css/views/settings/tabs/_GeneralUserSettingsTab.scss
similarity index 61%
rename from res/css/views/settings/tabs/_GeneralSettingsTab.scss
rename to res/css/views/settings/tabs/_GeneralUserSettingsTab.scss
index cbf56ab559..48b22c2348 100644
--- a/res/css/views/settings/tabs/_GeneralSettingsTab.scss
+++ b/res/css/views/settings/tabs/_GeneralUserSettingsTab.scss
@@ -14,33 +14,33 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_GeneralSettingsTab_changePassword,
-.mx_GeneralSettingsTab_themeSection {
+.mx_GeneralUserSettingsTab_changePassword,
+.mx_GeneralUserSettingsTab_themeSection {
   display: block;
 }
 
-.mx_GeneralSettingsTab_changePassword .mx_Field,
-.mx_GeneralSettingsTab_themeSection .mx_Field {
+.mx_GeneralUserSettingsTab_changePassword .mx_Field,
+.mx_GeneralUserSettingsTab_themeSection .mx_Field {
   display: block;
   margin-right: 100px; // Align with the other fields on the page
 }
 
-.mx_GeneralSettingsTab_changePassword .mx_Field input {
+.mx_GeneralUserSettingsTab_changePassword .mx_Field input {
   display: block;
   width: calc(100% - 20px); // subtract 10px padding on left and right
 }
 
-.mx_GeneralSettingsTab_changePassword .mx_Field:first-child {
+.mx_GeneralUserSettingsTab_changePassword .mx_Field:first-child {
   margin-top: 0;
 }
 
-.mx_GeneralSettingsTab_themeSection .mx_Field select {
+.mx_GeneralUserSettingsTab_themeSection .mx_Field select {
   display: block;
   width: 100%;
 }
 
-.mx_GeneralSettingsTab_accountSection > .mx_EmailAddresses,
-.mx_GeneralSettingsTab_accountSection > .mx_PhoneNumbers,
-.mx_GeneralSettingsTab_languageInput {
+.mx_GeneralUserSettingsTab_accountSection > .mx_EmailAddresses,
+.mx_GeneralUserSettingsTab_accountSection > .mx_PhoneNumbers,
+.mx_GeneralUserSettingsTab_languageInput {
   margin-right: 100px; // Align with the other fields on the page
 }
\ No newline at end of file
diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index b47b2368f9..00a2c30ccc 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import {Tab, TabbedView} from "../../structures/TabbedView";
 import {_t, _td} from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
-import GeneralSettingsTab from "../settings/tabs/GeneralSettingsTab";
+import GeneralUserSettingsTab from "../settings/tabs/GeneralUserSettingsTab";
 import dis from '../../../dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
 import LabsSettingsTab from "../settings/tabs/LabsSettingsTab";
@@ -56,7 +56,7 @@ export default class UserSettingsDialog extends React.Component {
         tabs.push(new Tab(
             _td("General"),
             "mx_UserSettingsDialog_settingsIcon",
-            <GeneralSettingsTab />,
+            <GeneralUserSettingsTab />,
         ));
         tabs.push(new Tab(
             _td("Notifications"),
diff --git a/src/components/views/settings/tabs/GeneralSettingsTab.js b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
similarity index 94%
rename from src/components/views/settings/tabs/GeneralSettingsTab.js
rename to src/components/views/settings/tabs/GeneralUserSettingsTab.js
index c1df7f4665..a504953cab 100644
--- a/src/components/views/settings/tabs/GeneralSettingsTab.js
+++ b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
@@ -36,7 +36,7 @@ const sdk = require('../../../../index');
 const Modal = require("../../../../Modal");
 const dis = require("../../../../dispatcher");
 
-export default class GeneralSettingsTab extends React.Component {
+export default class GeneralUserSettingsTab extends React.Component {
     static childContextTypes = {
         matrixClient: PropTypes.instanceOf(MatrixClient),
     };
@@ -123,7 +123,7 @@ export default class GeneralSettingsTab extends React.Component {
         const ChangePassword = sdk.getComponent("views.settings.ChangePassword");
         const passwordChangeForm = (
             <ChangePassword
-                className="mx_GeneralSettingsTab_changePassword"
+                className="mx_GeneralUserSettingsTab_changePassword"
                 rowClassName=""
                 buttonKind="primary"
                 onError={this._onPasswordChangeError}
@@ -131,7 +131,7 @@ export default class GeneralSettingsTab extends React.Component {
         );
 
         return (
-            <div className="mx_SettingsTab_section mx_GeneralSettingsTab_accountSection">
+            <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_accountSection">
                 <span className="mx_SettingsTab_subheading">{_t("Account")}</span>
                 <p className="mx_SettingsTab_subsectionText">
                     {_t("Set a new account password...")}
@@ -152,7 +152,7 @@ export default class GeneralSettingsTab extends React.Component {
         return (
             <div className="mx_SettingsTab_section">
                 <span className="mx_SettingsTab_subheading">{_t("Language and region")}</span>
-                <LanguageDropdown className="mx_GeneralSettingsTab_languageInput"
+                <LanguageDropdown className="mx_GeneralUserSettingsTab_languageInput"
                                   onOptionChange={this._onLanguageChange} value={this.state.language} />
             </div>
         );
@@ -162,7 +162,7 @@ export default class GeneralSettingsTab extends React.Component {
         // TODO: Re-enable theme selection once the themes actually work
         const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
         return (
-            <div className="mx_SettingsTab_section mx_GeneralSettingsTab_themeSection">
+            <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
                 <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
                 <Field id="theme" label={_t("Theme")} element="select" disabled={true}
                        value={this.state.theme} onChange={this._onThemeChange}>