diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 1ea99fb6ac..87557f9219 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -314,7 +314,7 @@ else {
 //get the list
 	$sql = "select * from v_default_settings ";
 	if (strlen($order_by) == 0) {
-		$sql .= "order by default_setting_category, default_setting_subcategory, default_setting_order asc ";
+		$sql .= "order by default_setting_category, default_setting_subcategory, default_setting_order asc, default_setting_name, default_setting_value ";
 	}
 	else {
 		$sql .= "order by $order_by $order ";
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 4785c72927..424a842b4e 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -126,7 +126,7 @@ if (sizeof($_REQUEST) > 1) {
 	$sql = "select * from v_domain_settings ";
 	$sql .= "where domain_uuid = '$domain_uuid' ";
 	if (strlen($order_by) == 0) {
-		$sql .= "order by domain_setting_category, domain_setting_subcategory, domain_setting_order asc ";
+		$sql .= "order by domain_setting_category, domain_setting_subcategory, domain_setting_order asc, domain_setting_name, domain_setting_value ";
 	}
 	else {
 		$sql .= "order by $order_by $order ";