Index: kernel/utility/formatters/date_formatter.php
===================================================================
--- kernel/utility/formatters/date_formatter.php	(revision 13936)
+++ kernel/utility/formatters/date_formatter.php	(working copy)
@@ -219,7 +219,14 @@
 			return adodb_gmdate($options['format'], $value);
 		}
 
-		return adodb_date($options['format'], $value);
+		$format = $options['format'];
+		$dt_separator = getArrayValue($options, 'date_time_separator');
+
+		if ($dt_separator) {
+			$format = trim($format, $dt_separator);
+		}
+
+		return adodb_date($format, $value);
 	}
 
 	function HumanFormat($format)
Index: units/custom_data/custom_data_event_handler.php
===================================================================
--- units/custom_data/custom_data_event_handler.php	(revision 13962)
+++ units/custom_data/custom_data_event_handler.php	(working copy)
@@ -163,6 +163,12 @@
 
 				switch ($custom_params['ElementType']) {
 					case 'date':
+						unset($field_options['options']);
+						$field_options['formatter'] = 'kDateFormatter';
+						$field_options['input_time_format'] = '';
+						$field_options['time_format'] = '';
+						break;
+
 					case 'datetime':
 						unset($field_options['options']);
 						$field_options['formatter'] = 'kDateFormatter';