diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml
index 137a1880cc..42be07a8a0 100644
--- a/usr/local/www/wizards/setup_wizard.xml
+++ b/usr/local/www/wizards/setup_wizard.xml
@@ -138,8 +138,6 @@
 			<description>Enter the hostname (FQDN) of the time server.</description>
 			<type>input</type>
 			<bindstofield>system->timeservers</bindstofield>
-			<validate>^[a-z0-9.|-]+$</validate>
-			<message>Invalid Time Server Field</message>
 		</field>
 		<field>
 			<name>Timezone</name>
@@ -153,9 +151,11 @@
 	</fields>
 	<stepsubmitphpaction>
 		<![CDATA[
-		if(!empty($_POST['timeserverhostname']) && !(is_hostname($_POST['timeserverhostname']) || is_ipaddr($_POST['timeserverhostname']))) {
-			print_info_box_np("Invalid Time Server. Please press back in your browser window and correct.");
-			die;
+		foreach (explode(' ', $_POST['timeserverhostname']) as $ts) {
+			if (!is_domain($ts)) {
+				print_info_box_np(gettext("NTP Time Server names may only contain the characters a-z, 0-9, '-' and '.'. Entries may be separated by spaces. Please press back in your browser window and correct."));
+				die;
+			}
 		}
 		]]>
 	</stepsubmitphpaction>