diff --git a/modules/Core/pages/panel/general_settings.php b/modules/Core/pages/panel/general_settings.php
index a999da77af..4caa17d847 100644
--- a/modules/Core/pages/panel/general_settings.php
+++ b/modules/Core/pages/panel/general_settings.php
@@ -24,10 +24,10 @@
 if (isset($_GET['do'])) {
     if ($_GET['do'] == 'installLanguage') {
         // Install new language
-        $languages = glob('custom' . DIRECTORY_SEPARATOR . 'languages' . DIRECTORY_SEPARATOR . '*');
+        $languages = glob('modules' . DIRECTORY_SEPARATOR . 'Core' . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR . '*');
         foreach ($languages as $item) {
             // cursed
-            $short_code = explode('.', explode(DIRECTORY_SEPARATOR, $item)[2])[0];
+            $short_code = explode('.', explode(DIRECTORY_SEPARATOR, $item)[3])[0];
 
             // Is it already in the database?
             $exists = DB::getInstance()->get('languages', ['short_code', $short_code])->results();
@@ -217,7 +217,7 @@
 $languages = DB::getInstance()->get('languages', ['id', '<>', 0])->results();
 $count = count($languages);
 for ($i = 0; $i < $count; $i++) {
-    $language_path = implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'custom', 'languages', $languages[$i]->short_code . '.json']);
+    $language_path = implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'modules', 'Core', 'language', $languages[$i]->short_code . '.json']);
     if (!file_exists($language_path)) {
         unset($languages[$i]);
     }
diff --git a/modules/Core/pages/user/settings.php b/modules/Core/pages/user/settings.php
index 9303882499..d629aece03 100644
--- a/modules/Core/pages/user/settings.php
+++ b/modules/Core/pages/user/settings.php
@@ -474,6 +474,11 @@
     $language_query = DB::getInstance()->get('languages', ['id', '<>', 0])->results();
 
     foreach ($language_query as $item) {
+        $language_path = implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'modules', 'Core', 'language', $item->short_code . '.json']);
+        if (!file_exists($language_path)) {
+            continue;
+        }
+
         $languages[] = [
             'name' => Output::getClean($item->name),
             'active' => $user->data()->language_id == $item->id