diff --git a/core/users/user_setting_edit.php b/core/users/user_setting_edit.php
index a2b0ca273c..8a13a8edc9 100644
--- a/core/users/user_setting_edit.php
+++ b/core/users/user_setting_edit.php
@@ -73,6 +73,7 @@ else {
 
 //get http post variables and set them to php variables
 	if (count($_REQUEST) > 0) {
+		echo "<pre>".print_r($_REQUEST, true)."</pre>";
 		$user_setting_category = strtolower(check_str($_REQUEST["user_setting_category"]));
 		$user_setting_subcategory = strtolower(check_str($_POST["user_setting_subcategory"]));
 		$user_setting_name = strtolower(check_str($_POST["user_setting_name"]));
@@ -470,10 +471,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					$dir_label = str_replace('_', ' ', $dir_name);
 					$dir_label = str_replace('-', ' ', $dir_label);
 					if ($dir_name == $row['user_setting_value']) {
-						echo "		<option value='$dir_name' selected='selected'>$dir_label</option>\n";
+						echo "		<option value='$dir_name' selected='selected'>".ucwords($dir_label)."</option>\n";
 					}
 					else {
-						echo "		<option value='$dir_name'>$dir_label</option>\n";
+						echo "		<option value='$dir_name'>".ucwords($dir_label)."</option>\n";
 					}
 				}
 			}
diff --git a/core/users/user_settings.php b/core/users/user_settings.php
index 6ca0c64981..824adfcd9f 100644
--- a/core/users/user_settings.php
+++ b/core/users/user_settings.php
@@ -93,8 +93,10 @@ else {
 //get the list
 	$sql = "select * from v_user_settings ";
 	$sql .= "where user_uuid = '$user_uuid' ";
-	$sql .= "and (user_setting_category <> 'domain' and user_setting_subcategory <> 'language') ";
-	$sql .= "and (user_setting_category <> 'domain' and user_setting_subcategory <> 'time_zone') ";
+	$sql .= "and not ( ";
+	$sql .= "(user_setting_category = 'domain' and user_setting_subcategory = 'language') ";
+	$sql .= "or (user_setting_category = 'domain' and user_setting_subcategory = 'time_zone') ";
+	$sql .= ") ";
 	if (strlen($order_by) == 0) {
 		$sql .= "order by user_setting_category, user_setting_subcategory, user_setting_order asc ";
 	}