diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 7c6eebb5a8..c8ea536334 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -446,27 +446,29 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 		switch ($validator[$type])
 		{
 			case 'url':
-				$cfg_array[$config_name] = trim($cfg_array[$config_name]);
-
-				if (!empty($cfg_array[$config_name]) && !preg_match('#^' . get_preg_expression('url') . '$#iu', $cfg_array[$config_name]))
-				{
-					$error[] = $language->lang('URL_INVALID', $language->lang($config_definition['lang']));
-				}
-
-				goto validate_string;
-
 			case 'csv':
-				// Validate comma separated values
-				$unfiltered_array = explode(',', $cfg_array[$config_name]);
-				$filtered_array = array_filter($unfiltered_array);
-				if (!empty($filtered_array) && count($unfiltered_array) !== count($filtered_array))
+				if ($validator[$type] == 'url')
 				{
-					$error[] = $language->lang('CSV_INVALID', $language->lang($config_definition['lang']));
-				}
+					$cfg_array[$config_name] = trim($cfg_array[$config_name]);
 
+					if (!empty($cfg_array[$config_name]) && !preg_match('#^' . get_preg_expression('url') . '$#iu', $cfg_array[$config_name]))
+					{
+						$error[] = $language->lang('URL_INVALID', $language->lang($config_definition['lang']));
+					}
+				}
+				else if ($validator[$type] == 'csv')
+				{
+					// Validate comma separated values
+					$unfiltered_array = explode(',', $cfg_array[$config_name]);
+					$filtered_array = array_filter($unfiltered_array);
+					if (!empty($filtered_array) && count($unfiltered_array) !== count($filtered_array))
+					{
+						$error[] = $language->lang('CSV_INVALID', $language->lang($config_definition['lang']));
+					}
+
+				}
 			// no break here
 
-			validate_string:
 			case 'string':
 				$length = utf8_strlen($cfg_array[$config_name]);