diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index e39c024231..40883faf40 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -559,6 +559,9 @@
 		echo "    	<option value='right' ".(($default_setting_value == "right") ? "selected='selected'" : null).">".$text['label-right']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "theme" && $subcategory == "custom_css_code" && $name == "text" ) {
+		echo "	<textarea class='formfld' style='min-width: 100%; height: 300px; font-family: courier, monospace; overflow: auto; resize: vertical' id='default_setting_value' name='default_setting_value' wrap='off'>".$default_setting_value."</textarea>\n";
+	}
 	elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) {
 		echo "    <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
 		echo "    	<option value='listen' ".(($default_setting_value == "listen") ? "selected='selected'" : null).">".$text['option-voicemail_file_listen']."</option>\n";
@@ -573,7 +576,7 @@
 		echo "	</select>\n";
 	}
 	elseif (is_json($default_setting_value)) {
-		echo "	<textarea class='formfld' style='width: 100%; height: 80px; font-family: courier; white-space: nowrap; overflow: auto;' id='default_setting_value' name='default_setting_value' wrap='off'>".$default_setting_value."</textarea>\n";
+		echo "	<textarea class='formfld' style='width: 100%; height: 80px; font-family: courier, monospace; overflow: auto;' id='default_setting_value' name='default_setting_value' wrap='off'>".$default_setting_value."</textarea>\n";
 	}
 	else {
 		echo "	<input class='formfld' type='text' id='default_setting_value' name='default_setting_value' value=\"".htmlspecialchars($default_setting_value)."\">\n";
@@ -671,9 +674,11 @@
 
 	echo "<script>\n";
 	//capture enter key to submit form
-		echo "	$(window).keypress(function(event){\n";
-		echo "		if (event.which == 13) { submit_form(); }\n";
-		echo "	});\n";
+		if (!($category == "theme" && $subcategory == "custom_css_code" && $name == "text" )) {
+			echo "	$(window).keypress(function(event){\n";
+			echo "		if (event.which == 13) { submit_form(); }\n";
+			echo "	});\n";
+		}
 	//hide/convert password fields then submit form
 		echo "	function submit_form() {\n";
 		echo "		$('input:password').css('visibility','hidden');\n";
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index d4337bfce7..bee01e8ac8 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -431,6 +431,9 @@
 				) {
 				echo "		".$text['label-'.$row['default_setting_value']];
 			}
+			else if ($category == 'theme' && $subcategory == 'custom_css_code' && $name == 'text') {
+				echo "		[...]\n";
+			}
 			else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
 				echo "		".str_repeat('*', strlen($row['default_setting_value']));
 			}
@@ -469,7 +472,9 @@
 			$array_setting_uuids[] = $row['default_setting_uuid'];
 			$array_setting_subcategories[] = $row['default_setting_subcategory'];
 			$array_setting_types[] = $row['default_setting_name'];
-			$array_setting_values[] = str_replace('"','\"',$row['default_setting_value']);
+			if (!($category == "theme" && $subcategory == "custom_css_code" && $name == "text" )) {
+				$array_setting_values[] = str_replace('"','\"',$row['default_setting_value']);
+			}
 			$array_setting_descriptions[] = str_replace('"','\"',$row['default_setting_description']);
 
 			$previous_category = $row['default_setting_category'];
diff --git a/themes/default/template.php b/themes/default/template.php
index 3ebd56548c..155b40bd0c 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -34,10 +34,16 @@ echo "<link rel='stylesheet' type='text/css' href='<!--{project_path}-->/resourc
 echo "<link rel='stylesheet' type='text/css' href='<!--{project_path}-->/resources/bootstrap/css/bootstrap-colorpicker.min.css'>\n";
 echo "<link rel='stylesheet' type='text/css' href='<!--{project_path}-->/themes/".escape($_SESSION['domain']['template']['name'])."/css.php".($default_login ? '?login=default' : null)."'>\n";
 
-//load custom css
+//link to custom css file
 	if ($_SESSION['theme']['custom_css']['text'] != '') {
 		echo "<link rel='stylesheet' type='text/css' href='".escape($_SESSION['theme']['custom_css']['text'])."'>\n\n";
 	}
+//output custom css
+	if ($_SESSION['theme']['custom_css_code']['text'] != '') {
+		echo "<style>\n";
+		echo escape($_SESSION['theme']['custom_css_code']['text']);
+		echo "</style>\n\n";
+	}
 
 //set fav icon
 	$favicon = (isset($_SESSION['theme']['favicon']['text'])) ? escape($_SESSION['theme']['favicon']['text']) : '<!--{project_path}-->/themes/default/favicon.ico';