diff --git a/src/common/config/base.json b/src/common/config/base.json
new file mode 100644
index 00000000..850251fa
--- /dev/null
+++ b/src/common/config/base.json
@@ -0,0 +1,28 @@
+{
+  "default": {
+    "teams": [],
+    "showTrayIcon": false,
+    "trayIconTheme": "light",
+    "minimizeToTray": false,
+    "version": "1",
+    "notifications": {
+      "flashWindow": 0
+    },
+    "showUnreadBadge": true,
+    "useSpellChecker": true,
+    "spellCheckerLocale": "en-US"
+  },
+  "1": {
+    "teams": [],
+    "showTrayIcon": false,
+    "trayIconTheme": "light",
+    "minimizeToTray": false,
+    "version": "1",
+    "notifications": {
+      "flashWindow": 0
+    },
+    "showUnreadBadge": true,
+    "useSpellChecker": true,
+    "spellCheckerLocale": "en-US"
+  }
+}
diff --git a/src/common/config/override.json b/src/common/config/override.json
new file mode 100644
index 00000000..0db3279e
--- /dev/null
+++ b/src/common/config/override.json
@@ -0,0 +1,3 @@
+{
+
+}
diff --git a/src/common/settings.js b/src/common/settings.js
index e4aab48a..8761787f 100644
--- a/src/common/settings.js
+++ b/src/common/settings.js
@@ -1,39 +1,38 @@
 'use strict';
 
 const fs = require('fs');
+const deepmerge = require('deepmerge').default;
+
 const settingsVersion = 1;
+const baseConfig = require('./config/base.json');
+const overrideConfig = require('./config/override.json');
 
 function merge(base, target) {
   return Object.assign({}, base, target);
 }
 
+function deepMergeArray(dest) {
+  return dest;
+}
+
 function loadDefault(version, spellCheckerLocale) {
   var ver = version;
   if (version == null) {
     ver = settingsVersion;
   }
-  switch (ver) {
-  case 1:
-    return {
-      teams: [],
-      showTrayIcon: false,
-      trayIconTheme: 'light',
-      minimizeToTray: false,
-      version: 1,
-      notifications: {
-        flashWindow: 0 // 0 = flash never, 1 = only when idle (after 10 seconds), 2 = always
-      },
-      showUnreadBadge: true,
-      useSpellChecker: true,
-      spellCheckerLocale: spellCheckerLocale || 'en-US'
-    };
-  default:
-    return {};
-  }
+
+  const base = baseConfig[ver] || baseConfig.default;
+  const override = overrideConfig[ver] || {};
+
+  const defaults = deepmerge(base, override, {clone: true, arrayMerge: deepMergeArray});
+
+  return Object.assign(defaults, {
+    spellCheckerLocale: spellCheckerLocale || defaults.spellCheckerLocale || 'en-US'
+  });
 }
 
 function upgradeV0toV1(configV0) {
-  var config = loadDefault(1);
+  var config = loadDefault('1');
   config.teams.push({
     name: 'Primary team',
     url: configV0.url
@@ -42,7 +41,7 @@ function upgradeV0toV1(configV0) {
 }
 
 function upgrade(config, newAppVersion) {
-  var configVersion = config.version ? config.version : 0;
+  var configVersion = config.version ? config.version : '1';
   if (newAppVersion) {
     config.lastMattermostVersion = newAppVersion;
   }
@@ -61,15 +60,19 @@ module.exports = {
 
   readFileSync(configFile) {
     var config = JSON.parse(fs.readFileSync(configFile, 'utf8'));
-    if (config.version === settingsVersion) {
+
+    // need to be able to compare 1 to '1'
+    if (config.version == settingsVersion) { // eslint-disable-line
       var defaultConfig = this.loadDefault();
       config = merge(defaultConfig, config);
     }
+
     return config;
   },
 
   writeFile(configFile, config, callback) {
-    if (config.version !== settingsVersion) {
+    // need to be able to compare 1 to '1'
+    if (config.version != settingsVersion) { // eslint-disable-line
       throw new Error('version ' + config.version + ' is not equal to ' + settingsVersion);
     }
     var data = JSON.stringify(config, null, '  ');
@@ -77,7 +80,8 @@ module.exports = {
   },
 
   writeFileSync(configFile, config) {
-    if (config.version !== settingsVersion) {
+    // need to be able to compare 1 to '1'
+    if (config.version != settingsVersion) { // eslint-disable-line
       throw new Error('version ' + config.version + ' is not equal to ' + settingsVersion);
     }
     var data = JSON.stringify(config, null, '  ');
diff --git a/src/package.json b/src/package.json
index af65f8c2..dd5ea7b3 100644
--- a/src/package.json
+++ b/src/package.json
@@ -12,6 +12,7 @@
     "auto-launch": "^5.0.1",
     "bootstrap": "^3.3.7",
     "create-react-class": "^15.5.3",
+    "deepmerge": "^1.5.1",
     "electron-context-menu": "^0.9.0",
     "electron-devtools-installer": "^2.2.0",
     "electron-is-dev": "^0.1.2",