diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 76cdbbfc3..542db98a1 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -317,7 +317,15 @@
             static $lang_selected = null;
             if(is_null($lang_selected)) {
                 $orig_lang_file = _XE_PATH_.'common/lang/lang.info';
-                $selected_lang_file = _XE_PATH_.'files/cache/lang_selected.info';
+                $selected_lang_file = _XE_PATH_.'files/config/lang_selected.info';
+                if(!file_exists($selected_lang_file) || !filesize($selected_lang_file)) {
+                    $old_selected_lang_file = _XE_PATH_.'files/cache/lang_selected.info';
+                    if(file_exists($old_selected_lang_file)) {
+                        FileHandler::copyFile($old_selected_lang_file, $selected_lang_file);
+                        FileHandler::removeFile($old_selected_lang_file);
+                    }
+                }
+
                 if(!file_exists($selected_lang_file) || !filesize($selected_lang_file)) {
                     $buff = FileHandler::readFile($orig_lang_file);
                     FileHandler::writeFile($selected_lang_file, $buff);
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index 51f916c72..cf7385e12 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -110,7 +110,7 @@
                 $buff .= sprintf("%s,%s\n", $langs[$i], $lang_supported[$langs[$i]]);
 
             }
-            FileHandler::writeFile(_XE_PATH_.'files/cache/lang_selected.info', trim($buff));
+            FileHandler::writeFile(_XE_PATH_.'files/config/lang_selected.info', trim($buff));
 
             $this->setMessage('success_updated');
         }