diff --git a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
index a9b2fed..c08e6df 100644
--- a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
+++ b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
@@ -307,13 +307,15 @@ Public Class ClassWindreamDocGrid
 
                 AddHandler dateedit.EditValueChanged, _datepickerValueChangedHandler
                 ' Brauchen wir Zeitangaben in den Custom Fields?
-                'AddHandler dateedit.CustomDisplayText, Sub(sender As Object, _e As DevExpress.XtraEditors.Controls.CustomDisplayTextEventArgs)
-                '                                           Dim value As String = _e.Value
-                '                                           _e.DisplayText = value
-                '                                           Dim parsedDate As DateTime = DateTime.ParseExact(value, "yyyy-MM-dd", System.Globalization.DateTimeFormatInfo.InvariantInfo)
+                AddHandler dateedit.CustomDisplayText, Sub(sender As Object, _e As DevExpress.XtraEditors.Controls.CustomDisplayTextEventArgs)
+                                                           Dim parsedDate As DateTime
 
-                '                                           _e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT & " HH:MM:ss")
-                '                                       End Sub
+                                                           If Not DateTime.TryParse(_e.Value, parsedDate) Then
+                                                               parsedDate = DateTime.ParseExact(_e.Value, CURRENT_DATE_FORMAT & " HH:MM:ss", System.Globalization.DateTimeFormatInfo.InvariantInfo)
+                                                           End If
+
+                                                           _e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT & " HH:MM:ss")
+                                                       End Sub
 
                 e.RepositoryItem = dateedit
             End If