diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index 9c29deb131..ef99f40765 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -933,7 +933,8 @@ abstract class bo_merge
 			{
 				if($value = $replacements['$$'.$field.'$$'])
 				{
-					$replacements['$$'.$field.'/date$$'] = egw_time::to($value,true);
+					$time = egw_time::createFromFormat('+'.egw_time::$user_dateformat.' '.egw_time::$user_timeformat.'*', $value);
+					$replacements['$$'.$field.'/date$$'] = $time ? $time->format(egw_time::$user_dateformat)  : '';
 				}
 			}
 		}