diff --git a/search/indico_search/forms.py b/search/indico_search/forms.py
index 79a3f48..f86414a 100644
--- a/search/indico_search/forms.py
+++ b/search/indico_search/forms.py
@@ -17,11 +17,11 @@
 from __future__ import unicode_literals
 
 from flask import request
-from wtforms.ext.dateutil.fields import DateField
 from wtforms.fields.core import StringField, SelectField
 from wtforms.validators import Optional
 
 from indico.web.forms.base import IndicoForm
+from indico.web.forms.fields import IndicoDateField
 
 from indico_search import _
 
@@ -37,8 +37,8 @@ FIELD_CHOICES = [('', _('Anywhere')),
 class SearchForm(IndicoForm):
     phrase = StringField(_('Phrase'))
     field = SelectField(_('Search in'), choices=FIELD_CHOICES, default='')
-    start_date = DateField('Start Date', [Optional()], parse_kwargs={'dayfirst': True})
-    end_date = DateField('End Date', [Optional()], parse_kwargs={'dayfirst': True})
+    start_date = IndicoDateField('Start Date', [Optional()])
+    end_date = IndicoDateField('End Date', [Optional()])
 
     def is_submitted(self):
         return 'search-phrase' in request.args
diff --git a/search/indico_search/templates/results.html b/search/indico_search/templates/results.html
index 1c5996a..09cca27 100644
--- a/search/indico_search/templates/results.html
+++ b/search/indico_search/templates/results.html
@@ -82,8 +82,6 @@
         var text = container.is(':hidden') ? $this.data('msgShow') : $this.data('msgHide');
         $('#toggle-advanced-options').text(text);
     });
-
-    $('#search-start_date, #search-end_date').datepicker();
 </script>
 
 {% block scripts %}{% endblock %}