diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 9c28000eb..967634d1b 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -677,7 +677,6 @@ class Context
 		static $lang_selected = null;
 		if(!$lang_selected)
 		{
-			$orig_lang_file = _XE_PATH_ . 'common/lang/lang.info';
 			$selected_lang_file = _XE_PATH_ . 'files/config/lang_selected.info';
 			if(!FileHandler::hasContent($selected_lang_file))
 			{
@@ -687,9 +686,13 @@ class Context
 
 			if(!FileHandler::hasContent($selected_lang_file))
 			{
-				$buff = FileHandler::readFile($orig_lang_file);
+				$lang_selected = Rhymix\Framework\Lang::getSupportedList();
+				$buff = '';
+				foreach($lang_selected as $key => $val)
+				{
+					$buff .= "$key,$val\n";
+				}
 				FileHandler::writeFile($selected_lang_file, $buff);
-				$lang_selected = self::loadLangSupported();
 			}
 			else
 			{
diff --git a/common/lang/lang.info b/common/lang/lang.info
deleted file mode 100644
index e0a301a21..000000000
--- a/common/lang/lang.info
+++ /dev/null
@@ -1,12 +0,0 @@
-ko,한국어
-en,English
-jp,日本語
-zh-CN,中文(中国)
-zh-TW,中文(臺灣)
-fr,Français
-de,Deutsch
-ru,Русский
-es,Español
-tr,Türkçe
-vi,Tiếng Việt
-mn,Mongolian