diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
index f5eb56f0..9d4d6ac2 100644
--- a/src/browser/components/SettingsPage.jsx
+++ b/src/browser/components/SettingsPage.jsx
@@ -343,7 +343,7 @@ const SettingsPage = createReactClass({
     );
 
     var srvMgmt;
-    if (this.props.enableServerManagement || this.state.teams.length === 0) {
+    if (this.props.enableServerManagement === true) {
       srvMgmt = (
         <div>
           {serversRow}
@@ -518,7 +518,7 @@ const SettingsPage = createReactClass({
               bsStyle='link'
               style={settingsPage.close}
               onClick={this.handleCancel}
-              disabled={this.state.teams.length === 0}
+              disabled={settings.mergeDefaultTeams(this.state.teams).length === 0}
             >
               <span>{'×'}</span>
             </Button>
diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index ce7364e1..df1ac2a8 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -23,7 +23,7 @@ const teams = settings.mergeDefaultTeams(AppConfig.data.teams);
 
 remote.getCurrentWindow().removeAllListeners('focus');
 
-if (AppConfig.data.teams.length === 0) {
+if (teams.length === 0) {
   window.location = 'settings.html';
 }
 
diff --git a/src/common/settings.js b/src/common/settings.js
index 30a56210..b435d504 100644
--- a/src/common/settings.js
+++ b/src/common/settings.js
@@ -69,7 +69,9 @@ module.exports = {
     if (hasBuildConfigDefaultTeams(buildConfig)) {
       newTeams.push(...JSON.parse(JSON.stringify(buildConfig.defaultTeams)));
     }
-    newTeams.push(...JSON.parse(JSON.stringify(teams)));
+    if (buildConfig.enableServerManagement) {
+      newTeams.push(...JSON.parse(JSON.stringify(teams)));
+    }
     return newTeams;
   }
 };
diff --git a/src/main/menus/app.js b/src/main/menus/app.js
index 114c48d1..9538b06c 100644
--- a/src/main/menus/app.js
+++ b/src/main/menus/app.js
@@ -40,7 +40,7 @@ function createTemplate(mainWindow, config, isDev) {
     }
   }];
 
-  if (buildConfig.enableServerManagement === true || config.teams.length === 0) {
+  if (buildConfig.enableServerManagement === true) {
     platformAppMenu.push({
       label: 'Sign in to Another Server',
       click() {