diff --git a/Classes/Controller/DateController.php b/Classes/Controller/DateController.php
index f4d36f0..601bb9c 100644
--- a/Classes/Controller/DateController.php
+++ b/Classes/Controller/DateController.php
@@ -90,11 +90,11 @@ class DateController extends ActionController
         }
 
         if ($this->request->hasArgument('start') && $this->request->getArgument('start') != '') {
-            $start = date( "Y-m-d", strtotime( $this->request->getArgument('start')));
+            $start = date( "d.m.y", strtotime( $this->request->getArgument('start')));
         }
 
         if ($this->request->hasArgument('end') && $this->request->getArgument('end') != '') {
-            $end = date( "Y-m-d", strtotime( $this->request->getArgument('end')));
+            $end = date( "d.m.y", strtotime( $this->request->getArgument('end')));
         }
 
         $demand = $this->createDemandFromSearch();
diff --git a/Resources/Private/Partials/Date/SearchForm.html b/Resources/Private/Partials/Date/SearchForm.html
index 2d8f8c5..5886f17 100644
--- a/Resources/Private/Partials/Date/SearchForm.html
+++ b/Resources/Private/Partials/Date/SearchForm.html
@@ -18,13 +18,23 @@
                     <div class="col">
                         <div class="form-group">
                             <label for="start">Datum von</label>
-                            <f:form.textfield type="text" class="form-control" id="start" name="start" value="{start}" />
+                            <div class="input-group date" id="date_start" data-target-input="nearest">
+                                <f:form.textfield type="text" class="form-control datetimepicker-input" id="start" name="start" value="{start}" additionalAttributes="{data-target: '#date_start'}" />
+                                <div class="input-group-append" data-target="#date_start" data-toggle="datetimepicker">
+                                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <div class="col">
                         <div class="form-group">
                             <label for="end">Datum bis</label>
-                            <f:form.textfield type="text" class="form-control" id="end" name="end" value="{end}" />
+                            <div class="input-group date" id="date_end" data-target-input="nearest">
+                                <f:form.textfield type="text" class="form-control datetimepicker-input" id="start" name="end" value="{end}" additionalAttributes="{data-target: '#date_end'}" />
+                                <div class="input-group-append" data-target="#date_end" data-toggle="datetimepicker">
+                                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>