diff --git a/core/default_settings/app_defaults.php b/core/default_settings/app_defaults.php
index 2d9d895bac..f8ef77bf5d 100644
--- a/core/default_settings/app_defaults.php
+++ b/core/default_settings/app_defaults.php
@@ -111,6 +111,7 @@
 				$sql .= "('".uuid()."', 'FYRO Macedonia', 'mk'), ";
 				$sql .= "('".uuid()."', 'Gaelic - Ireland', 'gd-ie'), ";
 				$sql .= "('".uuid()."', 'Gaelic - Scotland', 'gd'), ";
+				$sql .= "('".uuid()."', 'Georgian', 'ka-ge'), ";
 				$sql .= "('".uuid()."', 'German - Austria', 'de-at'), ";
 				$sql .= "('".uuid()."', 'German - Germany', 'de-de'), ";
 				$sql .= "('".uuid()."', 'German - Liechtenstein', 'de-li'), ";
@@ -495,7 +496,7 @@
 			$database->execute($sql);
 			unset($sql);
 
-		//update login destination 
+		//update login destination
 			$sql = "update v_default_settings set ";
 			$sql .= "default_setting_uuid = 'e2b9406f-37cf-4226-8111-e5d11d0bfd73', ";
 			$sql .= "default_setting_name = 'text' ";
diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index e1758fb3bb..c2037069e8 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -836,7 +836,7 @@
 	if (is_array($_SESSION['app']['languages']) && sizeof($_SESSION['app']['languages']) != 0) {
 		foreach ($_SESSION['app']['languages'] as $code) {
 			$selected = (isset($user_language) && $code == $user_language) || (isset($user_settings['domain']['language']['code']) && $code == $user_settings['domain']['language']['code']) ? "selected='selected'" : null;
-			echo "	<option value='".$code."' ".$selected.">".escape($language_codes[$code] ?? null)." [".escape($code ?? null)."]</option>\n";
+			echo "	<option value='".$code."' ".$selected.">".escape($language_codes[$code] ?? $language_codes[explode('-', $code)[0]] ?? null)." [".escape($code ?? null)."]</option>\n";
 		}
 	}
 	echo "		</select>\n";
diff --git a/core/users/user_profile.php b/core/users/user_profile.php
index 4bddc6f22d..de6537d8ab 100644
--- a/core/users/user_profile.php
+++ b/core/users/user_profile.php
@@ -542,7 +542,7 @@
 	if (is_array($_SESSION['app']['languages']) && sizeof($_SESSION['app']['languages']) != 0) {
 		foreach ($_SESSION['app']['languages'] as $code) {
 			$selected = (isset($user_language) && $code == $user_language) || (isset($user_settings['domain']['language']['code']) && $code == $user_settings['domain']['language']['code']) ? "selected='selected'" : null;
-			echo "	<option value='".$code."' ".$selected.">".escape($language_codes[$code] ?? null)." [".escape($code ?? null)."]</option>\n";
+			echo "	<option value='".$code."' ".$selected.">".escape($language_codes[$code] ?? $language_codes[explode('-', $code)[0]] ?? null)." [".escape($code ?? null)."]</option>\n";
 		}
 	}
 	echo "		</select>\n";