diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py
index 4c86fc93..8164b221 100644
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -206,7 +206,8 @@ USE_L10N = True
 
 USE_TZ = True
 
-DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M')#, '%Y-%m-%dT%H:%M:%S')
+# Need to allow seconds as datetime-local input type spits out a time that has seconds
+DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S')
 
 # Static files (CSS, JavaScript, Images)
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
diff --git a/RIGS/forms.py b/RIGS/forms.py
index 19c29f2b..9cd5a126 100644
--- a/RIGS/forms.py
+++ b/RIGS/forms.py
@@ -13,8 +13,8 @@ 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.TextInput(attrs={'type': 'time'})
-forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'})
+forms.TimeField.widget = forms.TimeInput(attrs={'type': 'time'}, format='%H:%M')
+forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'}, format='%Y-%m-%d %H:%M')
 
 
 # Events Shit
diff --git a/RIGS/templates/partials/event_details_form.html b/RIGS/templates/partials/event_details_form.html
index 047e116b..a1ca202b 100644
--- a/RIGS/templates/partials/event_details_form.html
+++ b/RIGS/templates/partials/event_details_form.html
@@ -41,7 +41,6 @@
                         </div>
                     </div>
                 </div>
-                {% localize off %}
                 <div class="form-group">
                     <label for="{{ form.start_date.id_for_label }}"
                            class="col-sm-4 control-label">{{ form.start_date.label }}</label>
@@ -101,7 +100,6 @@
                         </div>
                     </div>
                 </div>
-                {% endlocalize %}
 
                 {# Status is needed on all events types and it looks good here in the form #}
                 <div class="form-group" data-toggle="tooltip" title="The current status of the event. Only mark as booked once paperwork is received">
diff --git a/RIGS/tests/test_functional.py b/RIGS/tests/test_functional.py
index f214cdbd..e3c15152 100644
--- a/RIGS/tests/test_functional.py
+++ b/RIGS/tests/test_functional.py
@@ -23,6 +23,7 @@ from django.test.client import Client
 from django.core import mail, signing
 from django.http import HttpResponseBadRequest
 from django.conf import settings
+import sys
 
 
 @screenshot_failure_cls
@@ -119,7 +120,7 @@ class TestEventCreate(BaseRigboardTest):
 
         self.page.name = "Test Rig"
         self.page.start_date = datetime.date(2015, 1, 1)
-        self.page.start_time = datetime.time(10)
+        self.page.start_time = datetime.time(10, 00)
         self.page.end_date = datetime.date(2015, 1, 10)
         self.page.access_at = datetime.datetime(2015, 1, 1, 9)
         self.page.dry_hire = True
@@ -210,8 +211,8 @@ class TestEventCreate(BaseRigboardTest):
         self.page.name = "Test Date Validation"
         # end time before start
         self.page.start_date = datetime.date(2020, 1, 1)
-        self.page.start_time = datetime.time(10)
-        self.page.end_time = datetime.time(9)
+        self.page.start_time = datetime.time(10, 00)
+        self.page.end_time = datetime.time(9, 00)
 
         # Expected to fail
         self.page.submit()
@@ -219,7 +220,7 @@ class TestEventCreate(BaseRigboardTest):
         self.assertIn("can't finish before it has started", self.page.errors["General form errors"][0])
 
         # Fix it
-        self.page.end_time = datetime.time(23)
+        self.page.end_time = datetime.time(23, 00)
 
         # Should work
         self.page.submit()