diff --git a/client/package.json b/client/package.json
index 872cf721..26cafcb1 100644
--- a/client/package.json
+++ b/client/package.json
@@ -36,8 +36,8 @@
     "gulp-notify": "^2.2.0",
     "gulp-plumber": "^1.2.0",
     "gulp-rename": "^1.2.2",
-    "gulp-sass": "^2.0.4",
-    "gulp-sass-bulk-import": "^0.3.2",
+    "gulp-sass": "^4.0.1",
+    "gulp-sass-bulk-import": "^1.0.1",
     "gulp-sourcemaps": "^1.5.2",
     "gulp-streamify": "0.0.5",
     "gulp-uglify": "^2.1.2",
diff --git a/client/src/app/admin/panel/settings/admin-panel-system-preferences.js b/client/src/app/admin/panel/settings/admin-panel-system-preferences.js
index 732c852d..825fc06f 100644
--- a/client/src/app/admin/panel/settings/admin-panel-system-preferences.js
+++ b/client/src/app/admin/panel/settings/admin-panel-system-preferences.js
@@ -149,11 +149,12 @@ class AdminPanelSystemPreferences extends React.Component {
 
     onFormChange(form) {
         const { language, supportedLanguages, allowedLanguages } = form;
+        const languageIndex = _.indexOf(languageKeys, language);
 
         this.setState({
           values: _.extend({}, form, {
-              language: _.includes(supportedLanguages, language) ? language : Object.keys(languageList)[supportedLanguages[0]],
-              supportedLanguages: _.filter(supportedLanguages, (language) => _.includes(allowedLanguages, language))
+              language: _.includes(supportedLanguages, languageIndex) ? language : languageKeys[supportedLanguages[0]],
+              supportedLanguages: _.filter(supportedLanguages, (supportedIndex) => _.includes(allowedLanguages, supportedIndex))
           }),
           message: null
         });