diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index ea0de2ef30..7bc94d685e 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -440,7 +440,7 @@ class acp_board
 		// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
 		foreach ($display_vars['vars'] as $config_name => $null)
 		{
-			if ($null === false || strpos($config_name, 'legend') !== false)
+			if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
 			{
 				continue;
 			}
@@ -450,12 +450,6 @@ class acp_board
 				continue;
 			}
 
-			// If not set, then this is a valid entry and needs to be emptied (select_multiple, checkbox)
-			if (!isset($cfg_array[$config_name]))
-			{
-				$cfg_array[$config_name] = '';
-			}
-
 			// Erm, we spotted an array
 			if ($null['type'] == 'select_multiple' && $submit && isset($_REQUEST['config'][$config_name]))
 			{