diff --git a/themes/default/app_config.php b/themes/default/app_config.php
index 6d5222a841..7180f75063 100644
--- a/themes/default/app_config.php
+++ b/themes/default/app_config.php
@@ -1576,6 +1576,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set a secondary background color of the login page, for a gradient effect.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4ba8f015-f4e2-4992-928d-66da3c432a57";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "login_background_color_enabled";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable use of background color.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c6867c6f-898e-4cae-9c51-f4e2edf58ce1";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "login_background_image";
@@ -1588,7 +1596,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "login_background_image_enabled";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable use of background images on the login page.";
 		$y++;
diff --git a/themes/default/css.php b/themes/default/css.php
index 601d5d38b5..469c49c1dd 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -358,46 +358,46 @@ if (!empty($_SESSION['theme'])) {
 $background_images_enabled = false;
 if (!empty($_SESSION['username'])) {
 	//logged in - use standard background images
-	if ($settings->get('theme', 'background_image_enabled', false) && is_array($settings->get('theme', 'background_image', ''))) {
+	if ($settings->get('theme', 'background_image_enabled', false) && !empty($settings->get('theme', 'background_image', ''))) {
 		$background_images_enabled = true;
-		$background_images = $settings->get('theme', 'background_image', '');
+		$background_images = $settings->get('theme', 'background_image', array());
 	}
 
 	//logged in - use standard background colors
-	if ($settings->get('theme', 'background_color_enabled', true) && !empty($settings->get('theme', 'background_color')[0]) && !empty($settings->get('theme', 'background_color')[1])) {
+	if ($settings->get('theme', 'background_color_enabled', false) && !empty($settings->get('theme', 'background_color')[0]) && !empty($settings->get('theme', 'background_color')[1])) {
 		$background_colors[0] = $settings->get('theme', 'background_color')[0];
 		$background_colors[1] = $settings->get('theme', 'background_color')[1];
 	}
-	elseif ($settings->get('theme', 'background_color_enabled', true) && !empty($settings->get('theme', 'background_color')[0])) {
+	elseif ($settings->get('theme', 'background_color_enabled', false) && !empty($settings->get('theme', 'background_color')[0])) {
 		$background_colors[0] = $settings->get('theme', 'background_color')[0];
 	}
 }
 else {
 	//not logged in - try using login background images
-	if ($settings->get('theme', 'login_background_image_enabled', false) && is_array($settings->get('theme', 'login_background_image', ''))) {
+	if ($settings->get('theme', 'login_background_image_enabled', false) && !empty($settings->get('theme', 'login_background_image', ''))) {
 		$background_images_enabled = true;
-		$background_images = $settings->get('theme', 'login_background_image', '');
+		$background_images = $settings->get('theme', 'login_background_image', array());
 	}
 
 	//otherwise, use standard background images
-	if ($settings->get('theme', 'background_image_enabled', true) && is_array($settings->get('theme', 'background_image', ''))) {
+	if ($settings->get('theme', 'background_image_enabled', false) && !empty($settings->get('theme', 'background_image', ''))) {
 		$background_images_enabled = true;
-		$background_images = $settings->get('theme', 'background_image', '');
+		$background_images = $settings->get('theme', 'background_image', array());
 	}
 
 	//use standard background colors
-	if (!empty($settings->get('theme', 'login_background_color', '')) && !empty($settings->get('theme', 'login_background_color')[0]) && !empty($settings->get('theme', 'login_background_color')[1])) {
+	if ($settings->get('theme', 'login_background_color_enabled', false) && !empty($settings->get('theme', 'login_background_color', '')) && !empty($settings->get('theme', 'login_background_color')[0]) && !empty($settings->get('theme', 'login_background_color')[1])) {
 		$background_colors[0] = $settings->get('theme', 'login_background_color')[0];
 		$background_colors[1] = $settings->get('theme', 'login_background_color')[1];
 	}
-	elseif (!empty($settings->get('theme', 'login_background_color', '')) && !empty($settings->get('theme', 'login_background_color')[0])) {
+	elseif ($settings->get('theme', 'login_background_color_enabled', false) && !empty($settings->get('theme', 'login_background_color', '')) && !empty($settings->get('theme', 'login_background_color')[0])) {
 		$background_colors[0] = $settings->get('theme', 'login_background_color')[0];
 	}
-	elseif ($settings->get('theme', 'background_color_enabled', true) && !empty($settings->get('theme', 'background_color')[0]) && !empty($settings->get('theme', 'background_color')[1])) {
+	elseif (!$settings->get('theme', 'login_background_image_enabled', false) && $settings->get('theme', 'background_color_enabled', false) && !empty($settings->get('theme', 'background_color')[0]) && !empty($settings->get('theme', 'background_color')[1])) {
 		$background_colors[0] = $settings->get('theme', 'background_color')[0];
 		$background_colors[1] = $settings->get('theme', 'background_color')[1];
 	}
-	elseif ($settings->get('theme', 'background_color_enabled', true) && !empty($settings->get('theme', 'background_color')[0])) {
+	elseif (!$settings->get('theme', 'login_background_image_enabled', false) && $settings->get('theme', 'background_color_enabled', false) && !empty($settings->get('theme', 'background_color')[0])) {
 		$background_colors[0] = $settings->get('theme', 'background_color')[0];
 	}
 }
@@ -407,7 +407,7 @@ if ($background_images_enabled) {
 	//background image is enabled
 	$image_extensions = array('jpg','jpeg','png','gif');
 
-	if (count($background_images) > 0) {
+	if (is_array($background_images) && count($background_images) > 0) {
 
 		if ((!isset($_SESSION['background_image'])) or empty($_SESSION['background_image'])) {
 			$_SESSION['background_image'] = $background_images[array_rand($background_images)];
@@ -500,8 +500,6 @@ else { //default: white
 	$background_color = "";
 }
 
-
-
 ?>
 
 	html {