diff --git a/src/BreCalClient/DateTimePickerExt.cs b/src/BreCalClient/DateTimePickerExt.cs
index 2134bbd..e928bec 100644
--- a/src/BreCalClient/DateTimePickerExt.cs
+++ b/src/BreCalClient/DateTimePickerExt.cs
@@ -15,6 +15,15 @@ namespace BreCalClient
             string text = this.Text + e.Text;
             if (this.Template.FindName("PART_TextBox", this) is not WatermarkTextBox tb) return;
 
+            if (Regex.IsMatch(text, @"^\d{10}"))
+            {
+                e.Handled = true;
+                tb.Text = Regex.Replace(text, @"(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})", "$1.$2.20$3 $4:$5");
+                tb.CaretIndex = tb.Text.Length;
+                tb.SelectedText = "";
+            }
+
+            /*
             if (Regex.IsMatch(text, @"^\d{3}"))
             {
                 e.Handled = true;
@@ -57,6 +66,8 @@ namespace BreCalClient
                 tb.CaretIndex = tb.Text.Length;
                 tb.SelectedText = null;
             }
+            */
+
         }
     }
 }
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
index 92c0ed8..5de2857 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
@@ -45,7 +45,7 @@
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-            <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged" PreviewKeyUp="datePickerETD_PreviewKeyUp" PreviewTextInput="datePickerETD_PreviewTextInput"/>
+            <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged" AllowTextInput="True" />
             <local:DateTimePickerExt x:Name="datePickerETD_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
         </Grid>
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" FontWeight="Bold"/>
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
index 94748c1..2bdc6ac 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
@@ -346,48 +346,7 @@ namespace BreCalClient
             CheckOKButton();
         }
 
-        #endregion
-
-        private void datePickerETD_PreviewKeyUp(object sender, System.Windows.Input.KeyEventArgs e)
-        {
-
-        }
-
-        private void datePickerETD_PreviewTextInput(object sender, System.Windows.Input.TextCompositionEventArgs e)
-        {
-            DateTimePicker? dp = (sender as DateTimePicker);
-            if(dp == null) return;
-            
-            // Das ist der richtige Ansatz, funktioniert aber bei der Jahresangabe noch nicht ganz richtig.
-            // Die vom Agenten "vorgeschlagene" Zeit könnte auch der Watermark sein?
-
-            string text = dp.Text + e.Text;
-            if (dp.Template.FindName("PART_TextBox", dp) is not WatermarkTextBox tb) return;
-
-            if (Regex.IsMatch(text, @"^\d{3}"))
-            {
-                e.Handled = true;                                
-                tb.Text = Regex.Replace(text, @"(\d{2})(\d)", "$1.$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{3})"))
-            {
-                e.Handled = true;                
-                tb.Text = Regex.Replace(text, @"^(\d{2}\.\d{2})(\d)", "$1.$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{2} \d{3})"))
-            {
-                e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{2} \d{2})(\d)", "$1:$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{4} \d{3})"))
-            {
-                e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{4} \d{2})(\d)", "$1:$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-        }
+        #endregion        
+        
     }
 }