diff --git a/allauthdemo/polls/views.py b/allauthdemo/polls/views.py
index 737a6fc..b927e57 100755
--- a/allauthdemo/polls/views.py
+++ b/allauthdemo/polls/views.py
@@ -304,7 +304,14 @@ def create_event(request):
         demo_users = DemoUser.objects.all()
 
         # Render the template
-        return render(request, "polls/create_event.html", {"G_R_SITE_KEY": settings.RECAPTCHA_PUBLIC_KEY, "user_email": request.user.email, "events": events, "demo_users": demo_users})
+        return render(request,
+                      "polls/create_event.html",
+                      {
+                          "G_R_SITE_KEY": settings.RECAPTCHA_PUBLIC_KEY,
+                          "user_email": request.user.email,
+                          "events": events,
+                          "demo_users": demo_users
+                      })
     else:
         return HttpResponseNotAllowed()
 
diff --git a/allauthdemo/templates/polls/create_event.html b/allauthdemo/templates/polls/create_event.html
index 466d438..479d5eb 100755
--- a/allauthdemo/templates/polls/create_event.html
+++ b/allauthdemo/templates/polls/create_event.html
@@ -133,9 +133,9 @@
                               <th class="text-center">Actions</th>
                             </tr>
                           </thead>
-                          <tbody id="sort" class="formset option-formset" data-formset-prefix="questions" data-formset-type="inline">
+                          <tbody id="sort" class="formset option-formset" data-formset-prefix="options" data-formset-type="inline">
                             <!-- Option -->
-                            <tr class="formset-form sorting-row" data-formset-form-prefix="question">
+                            <tr class="formset-form sorting-row" data-formset-form-prefix="option">
                               <!-- # -->
                               <th class="formset-form-index text-center" scope=row>
                                 1
@@ -155,7 +155,7 @@
                               </td>
                             </tr>
                             <!-- Option -->
-                            <tr class="formset-form sorting-row" data-formset-form-prefix="question">
+                            <tr class="formset-form sorting-row" data-formset-form-prefix="option">
                               <!-- # -->
                               <th class="formset-form-index text-center" scope=row>
                                 2
@@ -175,7 +175,7 @@
                               </td>
                             </tr>
                             <!-- Option -->
-                            <tr class="formset-form sorting-row formset-form-empty hidden" data-formset-form-prefix="question">
+                            <tr class="formset-form sorting-row formset-form-empty hidden" data-formset-form-prefix="option">
                               <!-- # -->
                               <th class="formset-form-index text-center" scope=row>
                                 X
@@ -197,7 +197,7 @@
                           </tbody>
                         </table>
                         <div class="clearfix">
-                          <button type="button" class="btn btn-primary formset-add" data-formset-prefix="questions">
+                          <button type="button" class="btn btn-primary formset-add" data-formset-prefix="options">
                             <i class="fa fa-plus-circle" aria-hidden="true"></i>
                             Add Question Option
                           </button>
@@ -268,7 +268,7 @@
                               </td>
                             </tr>
                             <!-- Organiser -->
-                            <tr class="formset-form sorting-row" data-formset-form-prefix="question">
+                            <tr class="formset-form sorting-row" data-formset-form-prefix="organiser">
                               <th class="formset-form-index text-center" scope=row>
                                 <!-- # -->
                                 2
@@ -287,7 +287,7 @@
                               </td>
                             </tr>
                             <!-- Organiser -->
-                            <tr class="formset-form sorting-row formset-form-empty hidden" data-formset-form-prefix="question">
+                            <tr class="formset-form sorting-row formset-form-empty hidden" data-formset-form-prefix="organiser">
                               <th class="formset-form-index text-center" scope=row>
                                 <!-- # -->
                                 X
diff --git a/static/js/create-event-poll.js b/static/js/create-event-poll.js
index 28f70ed..142f7de 100755
--- a/static/js/create-event-poll.js
+++ b/static/js/create-event-poll.js
@@ -832,4 +832,17 @@ $('.formset-form-remove').click(function (e) { // Ported from DEMOS1
     }
     updateFormset(formset);
     formset.trigger('formsetFormRemoved');
+
+    // Perform validation now that a row has been removed
+    switch (formPrefix) {
+        case 'option':
+            validateFormField(isPollOptionsValid, "options-input-error-block");
+            break;
+        case 'organiser':
+            validateFormField(areOrganisersEmailsValid, "organisers-input-error-block");
+            break;
+        case 'trustee':
+            validateFormField(areTrusteesEmailsValid, "trustees-input-error-block");
+            break;
+    }
 });
\ No newline at end of file