diff --git a/organize/work/browser.py b/organize/work/browser.py
index de90159..ff96953 100644
--- a/organize/work/browser.py
+++ b/organize/work/browser.py
@@ -379,25 +379,35 @@ class CreateWorkItemForm(ObjectForm, BaseTrackView):
             return time.strftime('%Y-%m-%d', time.localtime(ts))
         return ''
 
+    @Lazy
+    def defaultTimeStamp(self):
+        if self.workItemType.prefillDate:
+            return getTimeStamp()
+        return None
+
     @Lazy
     def date(self):
-        ts = self.track.start or getTimeStamp()
-        return time.strftime('%Y-%m-%d', time.localtime(ts))
+        ts = self.track.start or self.defaultTimeStamp
+        if ts:
+            return time.strftime('%Y-%m-%d', time.localtime(ts))
+        return ''
 
     @Lazy
     def startTime(self):
-        ts = self.track.start or getTimeStamp()
-        #return time.strftime('%Y-%m-%dT%H:%M', time.localtime(ts))
-        return time.strftime('T%H:%M', time.localtime(ts))
+        ts = self.track.start or self.defaultTimeStamp
+        if ts:
+            return time.strftime('T%H:%M', time.localtime(ts))
+        return ''
 
     @Lazy
     def endTime(self):
         if self.state == 'running':
-            ts = getTimeStamp()
+            ts = self.defaultTimeStamp
         else:
-            ts = self.track.end or getTimeStamp()
-        #return time.strftime('%Y-%m-%dT%H:%M', time.localtime(ts))
-        return time.strftime('T%H:%M', time.localtime(ts))
+            ts = self.track.end or self.defaultTimeStamp
+        if ts:
+            return time.strftime('T%H:%M', time.localtime(ts))
+        return ''
 
     @Lazy
     def state(self):