diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index 32e6a8d33e8..aa7200c79b3 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -159,14 +159,16 @@ class DateTime(orm.AbstractModel):
         if isinstance(value, basestring):
             value = datetime.datetime.strptime(
                 value, DEFAULT_SERVER_DATETIME_FORMAT)
-        value = column.context_timestamp(
-            cr, uid, timestamp=value, context=context)
+        if value:
+            value = column.context_timestamp(
+                cr, uid, timestamp=value, context=context)
+            value = value.strftime(openerp.tools.DEFAULT_SERVER_DATETIME_FORMAT)
 
         attrs = super(DateTime, self).attributes(
             cr, uid, field_name, record, options, source_element, g_att, t_att,
             qweb_context, context=None)
         return itertools.chain(attrs, [
-            ('data-oe-original', value.strftime(openerp.tools.DEFAULT_SERVER_DATETIME_FORMAT))
+            ('data-oe-original', value)
         ])
 
     def from_html(self, cr, uid, model, column, element, context=None):
diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml
index 92cf6db243c..69e4fbf590e 100644
--- a/addons/website_event_track/data/event_demo.xml
+++ b/addons/website_event_track/data/event_demo.xml
@@ -86,7 +86,7 @@
             <field name="event_id" ref="event.event_0"/>
             <field name="website_published" eval="True"/>
             <field name="duration" eval="60"/>
-            <field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 10:00:00')" name="date_begin"/>
+            <field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 10:00:00')" name="date"/>
             <field name="speaker_ids" eval="[(6, 0, [ref('base.res_partner_address_4')])]"/>
             <field name="location_id" ref="website_event_track.event_track_location2"/>
             <field name="stage_id" ref="website_event_track.event_track_stage3"/>
@@ -117,7 +117,7 @@
             <field name="website_published" eval="True"/>
             <field name="duration" eval="60"/>
             <field name="priority">1</field>
-            <field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 11:00:00')" name="date_begin"/>
+            <field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 11:00:00')" name="date"/>
             <field name="speaker_ids" eval="[(6, 0, [ref('base.res_partner_address_13')])]"/>
             <field name="location_id" ref="website_event_track.event_track_location2"/>
             <field name="stage_id" ref="website_event_track.event_track_stage3"/>
@@ -164,7 +164,7 @@
             <field name="website_published" eval="True"/>
             <field name="duration" eval="40"/>
             <field name="priority">0</field>
-            <field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
+            <field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date"/>
             <field name="speaker_ids" eval="[(6, 0, [ref('base.res_partner_address_16')])]"/>
             <field name="location_id" ref="website_event_track.event_track_location1"/>
             <field name="stage_id" ref="website_event_track.event_track_stage4"/>