Index: orders_config.php
===================================================================
--- orders_config.php	(revision 14805)
+++ orders_config.php	(working copy)
@@ -367,11 +367,10 @@
 			            'ShippingPhone' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			            'ShippingFax' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			            'ShippingEmail' => Array (
-			            	'type' => 'string', 'not_null' => 1, 'default' => '',
-			            	'formatter' => 'kOptionsFormatter',
-			            	'options' => Array (),
-							'option_key_field' => 'DestAbbr',
-							'option_title_field' => 'Translation',
+			            	'type' => 'string',
+			            	'formatter' => 'kFormatter',
+			            	'regexp' => '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i',
+			            	'not_null' => 1, 'default' => '',
 						),
 			            'ShippingAddress1' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			            'ShippingAddress2' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),