diff --git a/RIGS/finance.py b/RIGS/finance.py
index 87764189..2c9f21c0 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -15,6 +15,9 @@ from z3c.rml import rml2pdf
 
 from RIGS import models
 
+from django import forms
+forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
+
 
 class InvoiceIndex(generic.ListView):
     model = models.Invoice
diff --git a/RIGS/forms.py b/RIGS/forms.py
index d1b826c3..e0d57f70 100644
--- a/RIGS/forms.py
+++ b/RIGS/forms.py
@@ -10,6 +10,10 @@ import simplejson
 
 from RIGS import models
 
+# Override the django form defaults to use the HTML date/time/datetime UI elements
+forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
+forms.TimeField.widget = forms.DateInput(attrs={'type': 'time'})
+forms.DateTimeField.widget = forms.DateInput(attrs={'type': 'datetime-local'})
 
 # Registration
 class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html
index b2b4dcd7..6832d571 100644
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/RIGS/event_form.html
@@ -289,10 +289,10 @@
                         <div class="col-sm-8">
                             <div class="row">
                                 <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="Start date for event, required">
-                                    {% render_field form.start_date type="date" class+="form-control" %}
+                                    {% render_field form.start_date class+="form-control" %}
                                 </div>
                                 <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="Start time of event, can be left blank">
-                                    {% render_field form.start_time type="time" class+="form-control" %}
+                                    {% render_field form.start_time class+="form-control" %}
                                 </div>
                             </div>
                         </div>
@@ -304,10 +304,10 @@
                         <div class="col-sm-8">
                             <div class="row">
                                 <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="End date of event, leave blank if unknown or same as start date">
-                                    {% render_field form.end_date type="date" class+="form-control" %}
+                                    {% render_field form.end_date class+="form-control" %}
                                 </div>
                                 <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="End time of event, leave blank if unknown">
-                                    {% render_field form.end_time type="time" class+="form-control" %}
+                                    {% render_field form.end_time class+="form-control" %}
                                 </div>
                             </div>
 
@@ -329,7 +329,7 @@
                                    class="col-sm-4 control-label">{{ form.access_at.label }}</label>
 
                             <div class="col-sm-8">
-                                {% render_field form.access_at type="datetime-local" class+="form-control" %}
+                                {% render_field form.access_at class+="form-control" %}
                             </div>
                         </div>
                         <div class="form-group" data-toggle="tooltip" title="The date/time at which crew should meet for this event">
@@ -337,7 +337,7 @@
                                    class="col-sm-4 control-label">{{ form.meet_at.label }}</label>
 
                             <div class="col-sm-8">
-                                {% render_field form.meet_at type="datetime-local" class+="form-control" %}
+                                {% render_field form.meet_at class+="form-control" %}
                             </div>
                         </div>
                         <div class="form-group">
diff --git a/RIGS/templates/RIGS/payment_form.html b/RIGS/templates/RIGS/payment_form.html
index 41bbf15b..13f4a694 100644
--- a/RIGS/templates/RIGS/payment_form.html
+++ b/RIGS/templates/RIGS/payment_form.html
@@ -16,7 +16,7 @@
                                for="{{ form.date.id_for_label }}">{{ form.date.label }}</label>
 
                         <div class="col-sm-10">
-                            {% render_field form.date type="date" class+="form-control" %}
+                            {% render_field form.date class+="form-control" %}
                         </div>
                     </div>