diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 15bf3aee49..d19cd29e56 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -330,8 +330,8 @@
 					case "api" : echo "API"; break;
 					case "cdr" : echo "CDR"; break;
 					case "ldap" : echo "LDAP"; break;
-					case "ivr menu" : echo "IVR Menu"; break;
-					default: echo ucwords(str_replace("_", " ", escape($row['default_setting_category'])));
+					case "ivr_menu" : echo "IVR Menu"; break;
+					default: echo escape(ucwords(str_replace("_", " ", $row['default_setting_category'])));
 				}
 				echo "</b>\n";
 
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index e153138cbc..01f7fb2830 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -256,17 +256,15 @@
 				if ($previous_category != '') {
 					echo "	<br /><br />\n";
 				}
-				echo "		<b>\n";
-				if (strtolower($row['domain_setting_category']) == "cdr") {
-					echo "		CDR";
+				echo "<b>";
+				switch (strtolower($row['domain_setting_category'])) {
+					case "api" : echo "API"; break;
+					case "cdr" : echo "CDR"; break;
+					case "ldap" : echo "LDAP"; break;
+					case "ivr_menu" : echo "IVR Menu"; break;
+					default: echo escape(ucwords(str_replace("_", " ", $row['domain_setting_category'])));
 				}
-				elseif (strtolower($row['domain_setting_category']) == "ldap") {
-					echo "		LDAP";
-				}
-				else {
-					echo "		".ucfirst($row['domain_setting_category']);
-				}
-				echo "		</b>\n";
+				echo "</b>\n";
 				echo "	</td>\n";
 				echo "</tr>\n";
 				echo "<tr>\n";