diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 3c4615d91e..76e4f93946 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -36,6 +36,9 @@ else {
 
 //add multi-lingual support
 	require_once "app_languages.php";
+	foreach($text['button-save'] as $key => $value) {
+		$languages[$key] = '';
+	}
 	foreach($text as $key => $value) {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
@@ -282,7 +285,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	} elseif ($category == "domain" && $subcategory == "language" && $name == "code" ) {
 		echo "		<select id='default_setting_value' name='default_setting_value' class='formfld' style=''>\n";
 		echo "		<option value=''></option>\n";
-		foreach ($text['button-save'] as $key => $value) {
+		foreach ($languages as $key => $value) {
 			if ($row['default_setting_value'] == $key) {
 				echo "		<option value='$key' selected='selected'>$key</option>\n";
 			}
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index afdea87b20..3785fe2e22 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -36,6 +36,9 @@ else {
 
 //add multi-lingual support
 	require_once "app_languages.php";
+	foreach($text['button-save'] as $key => $value) {
+		$languages[$key] = '';
+	}
 	foreach($text as $key => $value) {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
@@ -377,6 +380,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			closedir($handle);
 		}
 		echo "		</select>\n";
+	} elseif ($category == "domain" && $subcategory == "language" && $name == "code" ) {
+		echo "		<select id='domain_setting_value' name='domain_setting_value' class='formfld' style=''>\n";
+		echo "		<option value=''></option>\n";
+		foreach ($languages as $key => $value) {
+			if ($row['domain_setting_value'] == $key) {
+				echo "		<option value='$key' selected='selected'>$key</option>\n";
+			}
+			else {
+				echo "		<option value='$key'>$key</option>\n";
+			}
+		}
+		echo "		</select>\n";
 	} elseif ($category == "domain" && $subcategory == "time_zone" && $name == "name" ) {
 		echo "		<select id='domain_setting_value' name='domain_setting_value' class='formfld' style=''>\n";
 		echo "		<option value=''></option>\n";