diff --git a/src/events/forms.py b/src/events/forms.py
index 26ba737..a28cb01 100644
--- a/src/events/forms.py
+++ b/src/events/forms.py
@@ -42,13 +42,11 @@ class EventForm(forms.ModelForm):
     error_css_class = 'error'
     required_css_class = 'required'
 
-    start = forms.DateTimeField(
+    start = forms.SplitDateTimeField(
         label=_('start'), required=True,
-        widget=forms.SplitHiddenDateTimeWidget()
     )
-    end = forms.DateTimeField(
+    end = forms.SplitDateTimeField(
         label=_('end'), required=False,
-        widget=forms.SplitDateTimeWidget()
     )
 
     class Meta(object):
diff --git a/src/events/models.py b/src/events/models.py
index fdc8bd2..d805865 100644
--- a/src/events/models.py
+++ b/src/events/models.py
@@ -112,7 +112,7 @@ class Event(models.Model):
             return "New Event Model"
 
     def clean(self):
-        if self.end < self.start:
+        if self.end and self.end < self.start:
             raise ValidationError({
                 'end': _("A event can't end before it had started")
             })
diff --git a/src/events/templates/events/eventseries_form.html b/src/events/templates/events/eventseries_form.html
index 626b13a..67bbf05 100755
--- a/src/events/templates/events/eventseries_form.html
+++ b/src/events/templates/events/eventseries_form.html
@@ -12,7 +12,7 @@
   {{ formset.management_form }}
   <table>
     {% for form in formset %}
-      {% if forloop.counter = 1 %}
+      {% if forloop.counter == 1 %}
         <tr>{% for field in form.visible_fields %}<th>{{field.label_tag}}</th>{% endfor %}<th></th></tr>
       {% endif %}
       <tr>