diff --git a/src/search/forms.py b/src/search/forms.py
index 639345d..260fc3a 100644
--- a/src/search/forms.py
+++ b/src/search/forms.py
@@ -98,15 +98,10 @@ class ColabSearchForm(SearchForm):
         if self.cleaned_data['list']:
             sqs = sqs.filter(tag__in=self.cleaned_data['list'])
 
-        since = self.cleaned_data['since']
-        until = self.cleaned_data['until']
-
-        if since and until:
-            sqs = sqs.filter(modified__gte=since, modified__lte=until)
-        elif since and not until:
-            sqs = sqs.filter(modified__gte=since)
-        elif until and not since:
-            sqs = sqs.filter(modified__lte=until)
+        if self.cleaned_data['since']:
+            sqs = sqs.filter(modified__gte=self.cleaned_data['since'])
+        if self.cleaned_data['until']:
+            sqs = sqs.filter(modified__lte=self.cleaned_data['until'])
 
         if self.load_all:
             sqs = sqs.load_all()
diff --git a/src/templates/search/search.html b/src/templates/search/search.html
index 94c9f23..cfe5075 100644
--- a/src/templates/search/search.html
+++ b/src/templates/search/search.html
@@ -120,7 +120,7 @@
         <div class="form-group">
           <label for="since">{% trans "Since" %}</label>
             <div class="input-group date" id="datepicker_since">
-              <input type="text" class="form-control" placeholder="{% trans "Since" %}" name="since" value="{{ request.GET.since }}" data-format="MM/dd/yyyy" />
+              <input type="text" class="form-control" placeholder="{% trans "Since" %}" name="since" value="{{ request.GET.since }}" />
               <span class="input-group-addon">
                 <span class="glyphicon glyphicon-calendar"></span>
               </span>
@@ -129,7 +129,7 @@
         <div class="form-group">
           <label for="until">{% trans "Until" %}</label>
             <div class="input-group date" id="datepicker_until">
-              <input type="text" class="form-control" placeholder="{% trans "Until" %}" name="until" value="{{ request.GET.until }}" data-format="MM/dd/yyyy" />
+              <input type="text" class="form-control" placeholder="{% trans "Until" %}" name="until" value="{{ request.GET.until }}" />
               <span class="input-group-addon">
                 <span class="glyphicon glyphicon-calendar"></span>
               </span>
--
libgit2 0.21.2