diff --git a/cypress/integration/event.js b/cypress/integration/event.js
index 280e415..a045b4e 100644
--- a/cypress/integration/event.js
+++ b/cypress/integration/event.js
@@ -8,6 +8,9 @@ describe("Event", () => {
         cy.get("#name").type("Stadtfest");
         cy.checkEventStartEnd(false, test.recurrence, "date_definitions-0-");
 
+        cy.get("#add-date-defintion-btn").click();
+        cy.checkEventStartEnd(false, test.recurrence, "date_definitions-1-");
+
         cy.select2("event_place_id", "Neu");
         cy.get("#new_event_place-location-city").type("Goslar");
         cy.get("#new_place_container_search_link").click();
@@ -28,6 +31,9 @@ describe("Event", () => {
         cy.contains("a", "Veranstaltung bearbeiten").click();
         cy.url().should("include", "/update");
         cy.checkEventStartEnd(true, test.recurrence, "date_definitions-0-");
+
+        cy.get('div[data-prefix=date_definitions-1-] .remove-date-defintion-btn:visible').click()
+
         cy.get("#submit").click();
         cy.url().should(
           "include",
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 3aa1d7b..fc6ce26 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -223,7 +223,7 @@ Cypress.Commands.add(
     if (update && recurrence) {
       cy.get('#' + prefix + 'single-event-container').should("not.be.visible");
       cy.get('#' + prefix + 'recc-event-container').should("be.visible");
-      cy.get('[name="riedit"]').click();
+      cy.get('div[data-prefix=' + prefix + '] [name="riedit"]').click();
     } else {
       cy.checkEventAllday(prefix);
 
@@ -233,8 +233,8 @@ Cypress.Commands.add(
       cy.get("#ui-datepicker-div").should("not.be.visible");
 
       cy.get('#' + prefix + 'start-time').click();
-      cy.get(".ui-timepicker-wrapper").should("be.visible");
-      cy.get(".ui-timepicker-wrapper .ui-timepicker-am[data-time=0]").click(); // select 00:00
+      cy.get(".ui-timepicker-wrapper:visible").should("be.visible");
+      cy.get(".ui-timepicker-wrapper:visible .ui-timepicker-am[data-time=0]").click(); // select 00:00
       cy.get("#ui-datepicker-div").should("not.be.visible");
 
       cy.get('#' + prefix + 'end-container').should("not.be.visible");
@@ -254,17 +254,17 @@ Cypress.Commands.add(
     }
 
     cy.get(".modal-recurrence").should("be.visible");
-    cy.inputsShouldHaveSameValue('#' + prefix + 'start-user', "#recc-start-user");
-    cy.inputsShouldHaveSameValue('#' + prefix + 'start-time', "#recc-start-time");
-    cy.get("#rirtemplate option").should("have.length", 4);
-    cy.get(".modal-recurrence input[value=BYENDDATE]").should("be.checked");
-    cy.get(".modal-recurrence .modal-footer .btn-primary").click();
+    cy.inputsShouldHaveSameValue('#' + prefix + 'start-user', '#' + prefix + 'recc-start-user');
+    cy.inputsShouldHaveSameValue('#' + prefix + 'start-time', '#' + prefix + 'recc-start-time');
+    cy.get('#' + prefix + 'rirtemplate option').should("have.length", 4);
+    cy.get(".modal-recurrence:visible input[value=BYENDDATE]").should("be.checked");
+    cy.get(".modal-recurrence:visible .modal-footer .btn-primary").click();
 
     cy.get('#' + prefix + 'single-event-container').should("not.be.visible");
     cy.get('#' + prefix + 'recc-event-container').should("be.visible");
 
     if (recurrence == false) {
-      cy.get('[name="ridelete"]').click();
+      cy.get('[name="ridelete"]:visible').click();
       cy.get('#' + prefix + 'single-event-container').should("be.visible");
       cy.get('#' + prefix + 'recc-event-container').should("not.be.visible");
       cy.get('#' + prefix + 'end-container').should("not.be.visible");
@@ -284,14 +284,14 @@ Cypress.Commands.add(
     // Recurrence
     cy.get('#' + prefix + 'recc-button').click();
     cy.get(".modal-recurrence").should("be.visible");
-    cy.get('#recc-allday').should("be.checked");
-    cy.get('#recc-start-time').should("not.be.visible");
-    cy.get('#recc-fo-end-time').should("not.be.visible");
+    cy.get('#' + prefix + 'recc-allday').should("be.checked");
+    cy.get('#' + prefix + 'recc-start-time').should("not.be.visible");
+    cy.get('#' + prefix + 'recc-fo-end-time').should("not.be.visible");
 
-    cy.get('#recc-allday').click();
-    cy.get('#recc-start-time').should("be.visible");
-    cy.get('#recc-fo-end-time').should("be.visible");
-    cy.get(".modal-recurrence .modal-footer .btn-secondary").click();
+    cy.get('#' + prefix + 'recc-allday').click();
+    cy.get('#' + prefix + 'recc-start-time').should("be.visible");
+    cy.get('#' + prefix + 'recc-fo-end-time').should("be.visible");
+    cy.get(".modal-recurrence:visible .modal-footer .btn-secondary").click();
 
     // Turn off
     cy.get('#' + prefix + 'allday').click();
diff --git a/messages.pot b/messages.pot
index 987a0aa..5108d9c 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-04 16:04+0100\n"
+"POT-Creation-Date: 2021-11-14 16:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Legal notice"
 msgstr ""
 
-#: project/forms/admin.py:12 project/templates/_macros.html:1412
+#: project/forms/admin.py:12 project/templates/_macros.html:1383
 #: project/templates/layout.html:317
 #: project/templates/widget/event_suggestion/create.html:204
 #: project/views/admin_unit.py:73 project/views/root.py:53
@@ -307,12 +307,11 @@ msgstr ""
 msgid "Longitude"
 msgstr ""
 
-#: project/forms/admin_unit.py:29 project/forms/event.py:36
-#: project/forms/event.py:65 project/forms/event.py:398
-#: project/forms/event_place.py:25 project/forms/event_place.py:50
-#: project/forms/event_suggestion.py:26 project/forms/oauth2_client.py:66
-#: project/forms/organizer.py:25 project/forms/organizer.py:52
-#: project/forms/reference_request.py:23 project/templates/_macros.html:135
+#: project/forms/admin_unit.py:29 project/forms/event.py:85
+#: project/forms/event.py:114 project/forms/event_place.py:25
+#: project/forms/event_place.py:50 project/forms/event_suggestion.py:26
+#: project/forms/oauth2_client.py:66 project/forms/organizer.py:25
+#: project/forms/organizer.py:52 project/forms/reference_request.py:23
 #: project/templates/admin/admin_units.html:19
 #: project/templates/event_place/list.html:19
 #: project/templates/oauth2_client/list.html:25
@@ -327,32 +326,32 @@ msgstr ""
 msgid "The short name is used to create a unique identifier for your events"
 msgstr ""
 
-#: project/forms/admin_unit.py:41 project/templates/_macros.html:1548
+#: project/forms/admin_unit.py:41 project/templates/_macros.html:1519
 msgid "Short name must contain only letters numbers or underscore"
 msgstr ""
 
-#: project/forms/admin_unit.py:47 project/forms/event.py:57
-#: project/forms/event.py:95 project/forms/event_place.py:26
+#: project/forms/admin_unit.py:47 project/forms/event.py:106
+#: project/forms/event.py:124 project/forms/event_place.py:26
 #: project/forms/organizer.py:26
 msgid "Link URL"
 msgstr ""
 
 #: project/forms/admin_unit.py:48 project/forms/admin_unit_member.py:11
 #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
-#: project/forms/event.py:58 project/forms/event_suggestion.py:38
-#: project/forms/organizer.py:27 project/templates/_macros.html:262
-#: project/templates/_macros.html:1508 project/templates/admin/users.html:19
+#: project/forms/event.py:107 project/forms/event_suggestion.py:38
+#: project/forms/organizer.py:27 project/templates/_macros.html:226
+#: project/templates/_macros.html:1479 project/templates/admin/users.html:19
 msgid "Email"
 msgstr ""
 
-#: project/forms/admin_unit.py:49 project/forms/event.py:59
+#: project/forms/admin_unit.py:49 project/forms/event.py:108
 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28
-#: project/templates/_macros.html:315
+#: project/templates/_macros.html:279
 msgid "Phone"
 msgstr ""
 
-#: project/forms/admin_unit.py:50 project/forms/event.py:60
-#: project/forms/organizer.py:29 project/templates/_macros.html:323
+#: project/forms/admin_unit.py:50 project/forms/event.py:109
+#: project/forms/organizer.py:29 project/templates/_macros.html:287
 msgid "Fax"
 msgstr ""
 
@@ -439,467 +438,468 @@ msgstr ""
 msgid "Image"
 msgstr ""
 
-#: project/forms/common.py:72
+#: project/forms/common.py:71
 #, python-format
 msgid ""
 "I read and accept %(tos_open)sTerms of Service%(tos_close)s and "
 "%(privacy_open)sPrivacy%(privacy_close)s."
 msgstr ""
 
-#: project/forms/common.py:83
+#: project/forms/common.py:82
 msgid "0 (Little relevant)"
 msgstr ""
 
-#: project/forms/common.py:88
+#: project/forms/common.py:87
 msgid "5 (Default)"
 msgstr ""
 
-#: project/forms/common.py:93
+#: project/forms/common.py:92
 msgid "10 (Highlight)"
 msgstr ""
 
-#: project/forms/common.py:97
+#: project/forms/common.py:96
 msgid "Monday"
 msgstr ""
 
-#: project/forms/common.py:98
+#: project/forms/common.py:97
 msgid "Tueday"
 msgstr ""
 
-#: project/forms/common.py:99
+#: project/forms/common.py:98
 msgid "Wednesday"
 msgstr ""
 
-#: project/forms/common.py:100
+#: project/forms/common.py:99
 msgid "Thursday"
 msgstr ""
 
-#: project/forms/common.py:101
+#: project/forms/common.py:100
 msgid "Friday"
 msgstr ""
 
-#: project/forms/common.py:102
+#: project/forms/common.py:101
 msgid "Saturday"
 msgstr ""
 
-#: project/forms/common.py:103
+#: project/forms/common.py:102
 msgid "Sunday"
 msgstr ""
 
-#: project/forms/common.py:107
+#: project/forms/common.py:106
 msgid "500 m"
 msgstr ""
 
-#: project/forms/common.py:108
+#: project/forms/common.py:107
 msgid "5 km"
 msgstr ""
 
-#: project/forms/common.py:109
+#: project/forms/common.py:108
 msgid "10 km"
 msgstr ""
 
-#: project/forms/common.py:110
+#: project/forms/common.py:109
 msgid "20 km"
 msgstr ""
 
-#: project/forms/common.py:111
+#: project/forms/common.py:110
 msgid "50 km"
 msgstr ""
 
-#: project/forms/common.py:112
+#: project/forms/common.py:111
 msgid "100 km"
 msgstr ""
 
-#: project/forms/event.py:54
-msgid "Organizator"
-msgstr ""
-
-#: project/forms/event.py:67
-msgid "Enter a short, meaningful name for the event."
-msgstr ""
-
-#: project/forms/event.py:70
+#: project/forms/event.py:38
 msgid "Start"
 msgstr ""
 
-#: project/forms/event.py:72
-msgid "Indicate when the event will take place."
+#: project/forms/event.py:40
+msgid "Indicate when the event date will start."
 msgstr ""
 
-#: project/forms/event.py:75
+#: project/forms/event.py:43
 msgid "End"
 msgstr ""
 
-#: project/forms/event.py:77
-msgid "Indicate when the event will end. An event can last a maximum of 14 days."
+#: project/forms/event.py:45
+msgid ""
+"Indicate when the event date will end. An event can last a maximum of 14 "
+"days."
 msgstr ""
 
-#: project/forms/event.py:82 project/templates/planing/list.html:75
+#: project/forms/event.py:50 project/templates/planing/list.html:75
 msgid "All-day"
 msgstr ""
 
-#: project/forms/event.py:86 project/templates/event/create.html:274
-#: project/templates/event/update.html:165
+#: project/forms/event.py:54 project/templates/_macros.html:1699
 #: project/templates/widget/event_suggestion/create.html:240
 msgid "Recurring event"
 msgstr ""
 
-#: project/forms/event.py:90 project/forms/event_place.py:28
+#: project/forms/event.py:61 project/templates/_macros.html:1240
+msgid "The start must be before the end."
+msgstr ""
+
+#: project/forms/event.py:67 project/templates/_macros.html:1257
+msgid "An event can last a maximum of 14 days."
+msgstr ""
+
+#: project/forms/event.py:103
+msgid "Organizator"
+msgstr ""
+
+#: project/forms/event.py:116
+msgid "Enter a short, meaningful name for the event."
+msgstr ""
+
+#: project/forms/event.py:119 project/forms/event_place.py:28
 msgid "Description"
 msgstr ""
 
-#: project/forms/event.py:92
+#: project/forms/event.py:121
 msgid "Add an description of the event."
 msgstr ""
 
-#: project/forms/event.py:97
+#: project/forms/event.py:126
 msgid ""
 "Enter a link to an external website containing more information about the"
 " event."
 msgstr ""
 
-#: project/forms/event.py:102
+#: project/forms/event.py:131
 msgid "Ticket Link URL"
 msgstr ""
 
-#: project/forms/event.py:104
+#: project/forms/event.py:133
 msgid "Enter a link where tickets can be purchased."
 msgstr ""
 
-#: project/forms/event.py:107 project/templates/_macros.html:244
+#: project/forms/event.py:136 project/templates/_macros.html:208
 msgid "Tags"
 msgstr ""
 
-#: project/forms/event.py:109
+#: project/forms/event.py:138
 msgid ""
 "Enter keywords with which the event should be found. Words do not need to"
 " be entered if they are already in the name or description."
 msgstr ""
 
-#: project/forms/event.py:114
+#: project/forms/event.py:143
 msgid "Kid friendly"
 msgstr ""
 
-#: project/forms/event.py:116
+#: project/forms/event.py:145
 msgid "If the event is particularly suitable for children."
 msgstr ""
 
-#: project/forms/event.py:119
+#: project/forms/event.py:148
 msgid "Accessible for free"
 msgstr ""
 
-#: project/forms/event.py:121
+#: project/forms/event.py:150
 msgid "If the event is accessible for free."
 msgstr ""
 
-#: project/forms/event.py:124
+#: project/forms/event.py:153
 msgid "Typical Age from"
 msgstr ""
 
-#: project/forms/event.py:126
+#: project/forms/event.py:155
 msgid "The minimum age that participants should be."
 msgstr ""
 
-#: project/forms/event.py:129
+#: project/forms/event.py:158
 msgid "Typical Age to"
 msgstr ""
 
-#: project/forms/event.py:131
+#: project/forms/event.py:160
 msgid "The maximum age that participants should be."
 msgstr ""
 
-#: project/forms/event.py:134
+#: project/forms/event.py:163
 msgid "Registration required"
 msgstr ""
 
-#: project/forms/event.py:136
+#: project/forms/event.py:165
 msgid "If the participants needs to register for the event."
 msgstr ""
 
-#: project/forms/event.py:141 project/templates/_macros.html:276
+#: project/forms/event.py:170 project/templates/_macros.html:240
 #: project/templates/layout.html:128
 msgid "Booked up"
 msgstr ""
 
-#: project/forms/event.py:143
+#: project/forms/event.py:172
 msgid "If the event is booked up or sold out."
 msgstr ""
 
-#: project/forms/event.py:146
+#: project/forms/event.py:175
 msgid "Expected number of participants"
 msgstr ""
 
-#: project/forms/event.py:148
+#: project/forms/event.py:177
 msgid "The estimated expected attendance."
 msgstr ""
 
-#: project/forms/event.py:151
+#: project/forms/event.py:180
 msgid "Price info"
 msgstr ""
 
-#: project/forms/event.py:153
+#: project/forms/event.py:182
 msgid ""
 "Enter price information in textual form. E.g., different prices for "
 "adults and children."
 msgstr ""
 
-#: project/forms/event.py:158
+#: project/forms/event.py:187
 msgid "Target group origin"
 msgstr ""
 
-#: project/forms/event.py:163
+#: project/forms/event.py:192
 msgid "EventTargetGroupOrigin.both"
 msgstr ""
 
-#: project/forms/event.py:167
+#: project/forms/event.py:196
 msgid "EventTargetGroupOrigin.tourist"
 msgstr ""
 
-#: project/forms/event.py:171
+#: project/forms/event.py:200
 msgid "EventTargetGroupOrigin.resident"
 msgstr ""
 
-#: project/forms/event.py:174
+#: project/forms/event.py:203
 msgid ""
 "Choose whether the event is particularly suitable for tourists or "
 "residents."
 msgstr ""
 
-#: project/forms/event.py:179
+#: project/forms/event.py:208
 msgid "Attendance mode"
 msgstr ""
 
-#: project/forms/event.py:184
+#: project/forms/event.py:213
 msgid "EventAttendanceMode.offline"
 msgstr ""
 
-#: project/forms/event.py:188 project/templates/layout.html:116
+#: project/forms/event.py:217 project/templates/layout.html:116
 msgid "EventAttendanceMode.online"
 msgstr ""
 
-#: project/forms/event.py:190 project/templates/layout.html:119
+#: project/forms/event.py:219 project/templates/layout.html:119
 msgid "EventAttendanceMode.mixed"
 msgstr ""
 
-#: project/forms/event.py:192
+#: project/forms/event.py:221
 msgid "Choose how people can attend the event."
 msgstr ""
 
-#: project/forms/event.py:196 project/forms/event_place.py:27
+#: project/forms/event.py:225 project/forms/event_place.py:27
 #: project/templates/widget/event_suggestion/create.html:258
 msgid "Photo"
 msgstr ""
 
-#: project/forms/event.py:198
+#: project/forms/event.py:227
 msgid ""
 "We recommend uploading a photo for the event. It looks a lot more, but of"
 " course it works without it."
 msgstr ""
 
-#: project/forms/event.py:208 project/templates/_macros.html:1269
-msgid "The start must be before the end."
-msgstr ""
-
-#: project/forms/event.py:214 project/templates/_macros.html:1286
-msgid "An event can last a maximum of 14 days."
-msgstr ""
-
-#: project/forms/event.py:222 project/templates/_macros.html:423
-#: project/templates/_macros.html:586
+#: project/forms/event.py:242 project/templates/_macros.html:387
+#: project/templates/_macros.html:550
 msgid "Previous start date"
 msgstr ""
 
-#: project/forms/event.py:224
+#: project/forms/event.py:244
 msgid "Enter when the event should have taken place before it was postponed."
 msgstr ""
 
-#: project/forms/event.py:229 project/forms/event_suggestion.py:71
+#: project/forms/event.py:249 project/forms/event_suggestion.py:71
 msgid "Categories"
 msgstr ""
 
-#: project/forms/event.py:232 project/forms/event_suggestion.py:74
+#: project/forms/event.py:252 project/forms/event_suggestion.py:74
 msgid "Choose categories that fit the event."
 msgstr ""
 
-#: project/forms/event.py:235 project/forms/reference.py:14
+#: project/forms/event.py:255 project/forms/reference.py:14
 #: project/forms/reference.py:27 project/forms/reference_request.py:76
-#: project/templates/event/create.html:390
-#: project/templates/event/update.html:246
+#: project/templates/event/create.html:379
+#: project/templates/event/update.html:235
 msgid "Rating"
 msgstr ""
 
-#: project/forms/event.py:239 project/forms/reference.py:18
+#: project/forms/event.py:259 project/forms/reference.py:18
 #: project/forms/reference.py:31 project/forms/reference_request.py:80
 msgid ""
 "Choose how relevant the event is to your organization. The value is not "
 "visible and is used for sorting."
 msgstr ""
 
-#: project/forms/event.py:244
+#: project/forms/event.py:264
 msgid "Co-organizers"
 msgstr ""
 
-#: project/forms/event.py:247
+#: project/forms/event.py:267
 msgid ""
 "Select optional co-organizers. You can add and modify organizers at "
 "Organization > Organizers."
 msgstr ""
 
-#: project/forms/event.py:257
+#: project/forms/event.py:277
 msgid "Invalid co-organizer."
 msgstr ""
 
-#: project/forms/event.py:266 project/forms/event.py:275
-#: project/forms/event.py:344 project/forms/event_suggestion.py:50
-#: project/templates/_macros.html:463 project/templates/_macros.html:623
-#: project/templates/event/create.html:315
-#: project/templates/event/update.html:196
+#: project/forms/event.py:286 project/forms/event.py:295
+#: project/forms/event.py:368 project/forms/event_suggestion.py:50
+#: project/templates/_macros.html:427 project/templates/_macros.html:587
+#: project/templates/event/create.html:304
+#: project/templates/event/update.html:185
 #: project/templates/event_place/create.html:31
 #: project/templates/event_place/delete.html:13
 #: project/templates/event_place/update.html:31
 msgid "Place"
 msgstr ""
 
-#: project/forms/event.py:268
+#: project/forms/event.py:288
 msgid "Select existing place"
 msgstr ""
 
-#: project/forms/event.py:269
+#: project/forms/event.py:289
 msgid "Enter new place"
 msgstr ""
 
-#: project/forms/event.py:282 project/forms/event.py:291
-#: project/forms/event.py:352 project/forms/event.py:414
-#: project/forms/event_suggestion.py:60 project/templates/_macros.html:500
-#: project/templates/_macros.html:660 project/templates/event/create.html:284
-#: project/templates/event/update.html:186
+#: project/forms/event.py:302 project/forms/event.py:311
+#: project/forms/event.py:376 project/forms/event.py:439
+#: project/forms/event_suggestion.py:60 project/templates/_macros.html:464
+#: project/templates/_macros.html:624 project/templates/event/create.html:273
+#: project/templates/event/update.html:175
 #: project/templates/organizer/create.html:27
 #: project/templates/organizer/delete.html:13
 #: project/templates/organizer/update.html:27
 msgid "Organizer"
 msgstr ""
 
-#: project/forms/event.py:284
+#: project/forms/event.py:304
 msgid "Select existing organizer"
 msgstr ""
 
-#: project/forms/event.py:285
+#: project/forms/event.py:305
 msgid "Enter new organizer"
 msgstr ""
 
-#: project/forms/event.py:297
+#: project/forms/event.py:317
 msgid "Save as draft"
 msgstr ""
 
-#: project/forms/event.py:298
+#: project/forms/event.py:318
 msgid "Publish event"
 msgstr ""
 
-#: project/forms/event.py:328
+#: project/forms/event.py:350
 msgid "Select existing place or enter new place"
 msgstr ""
 
-#: project/forms/event.py:335
+#: project/forms/event.py:358
 msgid "Select existing organizer or enter new organizer"
 msgstr ""
 
-#: project/forms/event.py:347
+#: project/forms/event.py:371
 msgid ""
 "Choose where the event takes place. You can add and modify places at "
 "Organization > Places."
 msgstr ""
 
-#: project/forms/event.py:355
+#: project/forms/event.py:379
 msgid ""
 "Select the organizer. You can add and modify organizers at Organization >"
 " Organizers."
 msgstr ""
 
-#: project/forms/event.py:361 project/templates/event/update.html:175
+#: project/forms/event.py:385 project/templates/event/update.html:164
 #: project/templates/oauth2_token/list.html:21
 msgid "Status"
 msgstr ""
 
-#: project/forms/event.py:364
+#: project/forms/event.py:388
 msgid "EventStatus.scheduled"
 msgstr ""
 
-#: project/forms/event.py:365 project/templates/layout.html:82
+#: project/forms/event.py:389 project/templates/layout.html:82
 #: project/templates/layout.html:97
 msgid "EventStatus.cancelled"
 msgstr ""
 
-#: project/forms/event.py:366 project/templates/layout.html:85
+#: project/forms/event.py:390 project/templates/layout.html:85
 #: project/templates/layout.html:100
 msgid "EventStatus.movedOnline"
 msgstr ""
 
-#: project/forms/event.py:367 project/templates/layout.html:88
+#: project/forms/event.py:391 project/templates/layout.html:88
 #: project/templates/layout.html:103
 msgid "EventStatus.postponed"
 msgstr ""
 
-#: project/forms/event.py:368 project/templates/layout.html:91
+#: project/forms/event.py:392 project/templates/layout.html:91
 #: project/templates/layout.html:106
 msgid "EventStatus.rescheduled"
 msgstr ""
 
-#: project/forms/event.py:370
+#: project/forms/event.py:394
 msgid "Select the status of the event."
 msgstr ""
 
-#: project/forms/event.py:374
+#: project/forms/event.py:398
 msgid "Public status"
 msgstr ""
 
-#: project/forms/event.py:377
+#: project/forms/event.py:401
 msgid "PublicStatus.published"
 msgstr ""
 
-#: project/forms/event.py:378 project/templates/_macros.html:282
+#: project/forms/event.py:402 project/templates/_macros.html:246
 msgid "PublicStatus.draft"
 msgstr ""
 
-#: project/forms/event.py:380
+#: project/forms/event.py:404
 msgid "Select the public status of the event."
 msgstr ""
 
-#: project/forms/event.py:383 project/templates/event/update.html:5
-#: project/templates/event/update.html:141
+#: project/forms/event.py:407 project/templates/event/update.html:5
+#: project/templates/event/update.html:132
 msgid "Update event"
 msgstr ""
 
-#: project/forms/event.py:397 project/templates/_macros.html:1241
+#: project/forms/event.py:423 project/templates/_macros.html:1212
 #: project/templates/event/actions.html:47
 #: project/templates/event/delete.html:6
 msgid "Delete event"
 msgstr ""
 
-#: project/forms/event.py:405 project/forms/event_date.py:15
+#: project/forms/event.py:430 project/forms/event_date.py:15
 #: project/forms/planing.py:14
 msgid "From"
 msgstr ""
 
-#: project/forms/event.py:407 project/forms/event_date.py:17
+#: project/forms/event.py:432 project/forms/event_date.py:17
 #: project/forms/planing.py:16
 msgid "to"
 msgstr ""
 
-#: project/forms/event.py:409 project/forms/event_date.py:19
+#: project/forms/event.py:434 project/forms/event_date.py:19
 msgid "Keyword"
 msgstr ""
 
-#: project/forms/event.py:411 project/forms/event_date.py:21
-#: project/forms/planing.py:19 project/templates/_macros.html:396
+#: project/forms/event.py:436 project/forms/event_date.py:21
+#: project/forms/planing.py:19 project/templates/_macros.html:360
 msgid "Category"
 msgstr ""
 
-#: project/forms/event.py:417
+#: project/forms/event.py:442
 msgid "Find events"
 msgstr ""
 
 #: project/forms/event_date.py:24 project/forms/planing.py:22
-#: project/templates/_macros.html:137 project/templates/_macros.html:330
+#: project/templates/_macros.html:294
 #: project/templates/admin_unit/create.html:38
 #: project/templates/admin_unit/update.html:39
 #: project/templates/event_place/create.html:40
@@ -925,8 +925,7 @@ msgstr ""
 msgid "Create place"
 msgstr ""
 
-#: project/forms/event_place.py:45 project/templates/event_place/read.html:12
-#: project/templates/event_place/update.html:5
+#: project/forms/event_place.py:45 project/templates/event_place/update.html:5
 #: project/templates/event_place/update.html:21
 msgid "Update place"
 msgstr ""
@@ -955,13 +954,13 @@ msgstr ""
 msgid "I would like to be notified by email after the review"
 msgstr ""
 
-#: project/forms/event_suggestion.py:52 project/templates/event/create.html:320
+#: project/forms/event_suggestion.py:52 project/templates/event/create.html:309
 msgid ""
 "Choose where the event takes place. If the venue is not yet in the list, "
 "just enter it."
 msgstr ""
 
-#: project/forms/event_suggestion.py:62 project/templates/event/create.html:288
+#: project/forms/event_suggestion.py:62 project/templates/event/create.html:277
 msgid ""
 "Select the organizer. If the organizer is not yet on the list, just enter"
 " it."
@@ -973,27 +972,27 @@ msgstr ""
 msgid "Create event suggestion"
 msgstr ""
 
-#: project/forms/event_suggestion.py:116 project/forms/reference_request.py:48
+#: project/forms/event_suggestion.py:124 project/forms/reference_request.py:48
 msgid "Rejection reason"
 msgstr ""
 
-#: project/forms/event_suggestion.py:121
+#: project/forms/event_suggestion.py:129
 msgid "EventRejectionReason.noreason"
 msgstr ""
 
-#: project/forms/event_suggestion.py:125
+#: project/forms/event_suggestion.py:133
 msgid "EventRejectionReason.duplicate"
 msgstr ""
 
-#: project/forms/event_suggestion.py:129
+#: project/forms/event_suggestion.py:137
 msgid "EventRejectionReason.untrustworthy"
 msgstr ""
 
-#: project/forms/event_suggestion.py:133
+#: project/forms/event_suggestion.py:141
 msgid "EventRejectionReason.illegal"
 msgstr ""
 
-#: project/forms/event_suggestion.py:138
+#: project/forms/event_suggestion.py:146
 #: project/templates/event_suggestion/reject.html:9
 #: project/templates/event_suggestion/review.html:33
 #: project/templates/event_suggestion/review.html:40
@@ -1043,7 +1042,7 @@ msgid "Weekdays"
 msgstr ""
 
 #: project/forms/reference.py:11 project/forms/reference_request.py:16
-#: project/templates/_macros.html:516 project/templates/_macros.html:676
+#: project/templates/_macros.html:480 project/templates/_macros.html:640
 #: project/templates/admin_unit/create.html:28
 #: project/templates/admin_unit/update.html:29
 #: project/templates/layout.html:258
@@ -1071,7 +1070,7 @@ msgstr ""
 msgid "Delete request"
 msgstr ""
 
-#: project/forms/reference_request.py:28 project/templates/_macros.html:1424
+#: project/forms/reference_request.py:28 project/templates/_macros.html:1395
 #: project/templates/event_suggestion/review_status.html:18
 #: project/templates/reference_request/review_status.html:12
 msgid "Review status"
@@ -1133,108 +1132,98 @@ msgstr ""
 msgid "This field is required."
 msgstr ""
 
-#: project/templates/_macros.html:134 project/templates/_macros.html:418
-#: project/templates/_macros.html:937
-msgid "Date"
-msgstr ""
-
-#: project/templates/_macros.html:136
-msgid "Host"
-msgstr ""
-
-#: project/templates/_macros.html:158
-msgid "Show all events"
-msgstr ""
-
-#: project/templates/_macros.html:174
+#: project/templates/_macros.html:138
 msgid "Show on Google Maps"
 msgstr ""
 
-#: project/templates/_macros.html:253
+#: project/templates/_macros.html:217
 msgid "Link"
 msgstr ""
 
-#: project/templates/_macros.html:309
+#: project/templates/_macros.html:273
 msgid "Verified"
 msgstr ""
 
-#: project/templates/_macros.html:373
+#: project/templates/_macros.html:337
 #, python-format
 msgid "Created at %(created_at)s by %(created_by)s."
 msgstr ""
 
-#: project/templates/_macros.html:375
+#: project/templates/_macros.html:339
 #, python-format
 msgid "Created at %(created_at)s."
 msgstr ""
 
-#: project/templates/_macros.html:380
+#: project/templates/_macros.html:344
 #, python-format
 msgid "Last updated at %(updated_at)s by %(updated_by)s."
 msgstr ""
 
-#: project/templates/_macros.html:382
+#: project/templates/_macros.html:346
 #, python-format
 msgid "Last updated at %(updated_at)s."
 msgstr ""
 
-#: project/templates/_macros.html:412 project/templates/_macros.html:582
+#: project/templates/_macros.html:376 project/templates/_macros.html:546
 #: project/templates/event/actions.html:12
-#: project/templates/event/create.html:257
-#: project/templates/event/delete.html:13
-#: project/templates/event/update.html:148
+#: project/templates/event/create.html:250
+#: project/templates/event/update.html:141
 #: project/templates/widget/event_suggestion/create.html:229
 msgid "Event"
 msgstr ""
 
-#: project/templates/_macros.html:445 project/templates/_macros.html:604
-#: project/templates/_macros.html:1493 project/templates/event/actions.html:32
+#: project/templates/_macros.html:382 project/templates/_macros.html:908
+msgid "Date"
+msgstr ""
+
+#: project/templates/_macros.html:409 project/templates/_macros.html:568
+#: project/templates/_macros.html:1464 project/templates/event/actions.html:32
 msgid "Share"
 msgstr ""
 
-#: project/templates/_macros.html:449 project/templates/_macros.html:608
-#: project/templates/_macros.html:1523
+#: project/templates/_macros.html:413 project/templates/_macros.html:572
+#: project/templates/_macros.html:1494
 msgid "Add to calendar"
 msgstr ""
 
-#: project/templates/_macros.html:457 project/templates/_macros.html:616
+#: project/templates/_macros.html:421 project/templates/_macros.html:580
 #: project/templates/event/report.html:4
 msgid "Report event"
 msgstr ""
 
-#: project/templates/_macros.html:484 project/templates/_macros.html:642
+#: project/templates/_macros.html:448 project/templates/_macros.html:606
 msgid "Show directions"
 msgstr ""
 
-#: project/templates/_macros.html:489 project/templates/_macros.html:647
+#: project/templates/_macros.html:453 project/templates/_macros.html:611
 msgid "The event takes place online."
 msgstr ""
 
-#: project/templates/_macros.html:491 project/templates/_macros.html:649
+#: project/templates/_macros.html:455 project/templates/_macros.html:613
 msgid "The event takes place both offline and online."
 msgstr ""
 
-#: project/templates/_macros.html:703 project/templates/event_date/list.html:5
+#: project/templates/_macros.html:667 project/templates/event_date/list.html:5
 #: project/templates/event_date/list.html:300
 #: project/templates/reference_request/review.html:32
 msgid "Event Dates"
 msgstr ""
 
-#: project/templates/_macros.html:795
+#: project/templates/_macros.html:759
 msgid "Search location on Google"
 msgstr ""
 
-#: project/templates/_macros.html:861
+#: project/templates/_macros.html:825
 #, python-format
 msgid "%(count)d event dates"
 msgstr ""
 
-#: project/templates/_macros.html:877 project/templates/_macros.html:879
+#: project/templates/_macros.html:848 project/templates/_macros.html:850
 #: project/templates/event_date/list.html:321
 msgid "First"
 msgstr ""
 
-#: project/templates/_macros.html:882 project/templates/_macros.html:884
+#: project/templates/_macros.html:853 project/templates/_macros.html:855
 #: project/templates/event_date/list.html:322
 #: project/templates/widget/event_suggestion/create.html:193
 #: project/templates/widget/event_suggestion/create.html:218
@@ -1245,12 +1234,12 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: project/templates/_macros.html:886
+#: project/templates/_macros.html:857
 #, python-format
 msgid "Page %(page)d of %(pages)d (%(total)d total)"
 msgstr ""
 
-#: project/templates/_macros.html:888 project/templates/_macros.html:890
+#: project/templates/_macros.html:859 project/templates/_macros.html:861
 #: project/templates/event_date/list.html:324
 #: project/templates/widget/event_suggestion/create.html:194
 #: project/templates/widget/event_suggestion/create.html:219
@@ -1260,76 +1249,80 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: project/templates/_macros.html:893 project/templates/_macros.html:895
+#: project/templates/_macros.html:864 project/templates/_macros.html:866
 #: project/templates/event_date/list.html:325
 msgid "Last"
 msgstr ""
 
-#: project/templates/_macros.html:960
+#: project/templates/_macros.html:931
 msgid "Radius"
 msgstr ""
 
-#: project/templates/_macros.html:1170
+#: project/templates/_macros.html:1141
 msgid "Edit image"
 msgstr ""
 
-#: project/templates/_macros.html:1191
+#: project/templates/_macros.html:1162
 msgid "Close"
 msgstr ""
 
-#: project/templates/_macros.html:1192
+#: project/templates/_macros.html:1163
 msgid "Okay"
 msgstr ""
 
-#: project/templates/_macros.html:1204
+#: project/templates/_macros.html:1175
 msgid "Choose image file"
 msgstr ""
 
-#: project/templates/_macros.html:1240 project/templates/event/actions.html:46
+#: project/templates/_macros.html:1211 project/templates/event/actions.html:46
 msgid "Edit event"
 msgstr ""
 
-#: project/templates/_macros.html:1243 project/templates/manage/events.html:45
+#: project/templates/_macros.html:1214 project/templates/manage/events.html:45
 msgid "More"
 msgstr ""
 
-#: project/templates/_macros.html:1290
+#: project/templates/_macros.html:1261
 msgid "Please enter a valid time, between 00:00 and 23:59."
 msgstr ""
 
-#: project/templates/_macros.html:1318
+#: project/templates/_macros.html:1289
 #, python-format
 msgid "Just use %(term)s"
 msgstr ""
 
-#: project/templates/_macros.html:1384
+#: project/templates/_macros.html:1355
 msgid "Event suggestion"
 msgstr ""
 
-#: project/templates/_macros.html:1502
+#: project/templates/_macros.html:1473
 msgid "Link copied"
 msgstr ""
 
-#: project/templates/_macros.html:1502
+#: project/templates/_macros.html:1473
 msgid "Copy link"
 msgstr ""
 
-#: project/templates/_macros.html:1531
+#: project/templates/_macros.html:1502
 msgid "Google calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1532
+#: project/templates/_macros.html:1503
 msgid "Apple calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1533
+#: project/templates/_macros.html:1504
 msgid "Yahoo calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1534
+#: project/templates/_macros.html:1505
 msgid "Other calendar"
 msgstr ""
 
+#: project/templates/_macros.html:1700
+msgid "Remove event date"
+msgstr ""
+
 #: project/templates/home.html:28
 msgid "Manage"
 msgstr ""
@@ -1339,8 +1332,8 @@ msgstr ""
 msgid "Register for free"
 msgstr ""
 
-#: project/templates/event_place/read.html:22 project/templates/layout.html:175
-#: project/templates/layout.html:219 project/templates/manage/events.html:6
+#: project/templates/layout.html:175 project/templates/layout.html:219
+#: project/templates/manage/events.html:6
 #: project/templates/manage/events.html:24
 msgid "Events"
 msgstr ""
@@ -1382,7 +1375,7 @@ msgid "Show events"
 msgstr ""
 
 #: project/templates/event/create.html:5
-#: project/templates/event/create.html:250 project/templates/layout.html:226
+#: project/templates/event/create.html:241 project/templates/layout.html:226
 #: project/templates/manage/events.html:27
 #: project/templates/manage/organizers.html:21
 msgid "Create event"
@@ -1501,8 +1494,8 @@ msgstr ""
 
 #: project/templates/admin_unit/create.html:58
 #: project/templates/admin_unit/update.html:59
-#: project/templates/event/create.html:378
-#: project/templates/event/update.html:234
+#: project/templates/event/create.html:367
+#: project/templates/event/update.html:223
 #: project/templates/event_place/create.html:57
 #: project/templates/event_place/update.html:57
 #: project/templates/organizer/create.html:56
@@ -1642,40 +1635,45 @@ msgstr ""
 msgid "List all events of %(admin_unit_name)s"
 msgstr ""
 
-#: project/templates/event/create.html:97
-#: project/templates/event/update.html:83
+#: project/templates/event/create.html:90
+#: project/templates/event/update.html:76
 #: project/templates/widget/event_suggestion/create.html:104
 msgid "Enter place or address"
 msgstr ""
 
-#: project/templates/event/create.html:183
-#: project/templates/event/create.html:240
-#: project/templates/event/update.html:106
-#: project/templates/event/update.html:132
+#: project/templates/event/create.html:176
+#: project/templates/event/create.html:233
+#: project/templates/event/update.html:99
+#: project/templates/event/update.html:125
 #: project/templates/widget/event_suggestion/create.html:129
 msgid "Enter organizer"
 msgstr ""
 
-#: project/templates/event/create.html:267
-#: project/templates/event/update.html:158
-msgid "Event date"
+#: project/templates/event/create.html:260
+#: project/templates/event/update.html:151
+msgid "Event dates"
 msgstr ""
 
-#: project/templates/event/create.html:305
+#: project/templates/event/create.html:267
+#: project/templates/event/update.html:158
+msgid "Add event date"
+msgstr ""
+
+#: project/templates/event/create.html:294
 msgid "Switch to organizer search"
 msgstr ""
 
-#: project/templates/event/create.html:340
+#: project/templates/event/create.html:329
 msgid "Switch to place search"
 msgstr ""
 
-#: project/templates/event/create.html:351
-#: project/templates/event/update.html:207
+#: project/templates/event/create.html:340
+#: project/templates/event/update.html:196
 msgid "Access"
 msgstr ""
 
-#: project/templates/event/create.html:365
-#: project/templates/event/update.html:221
+#: project/templates/event/create.html:354
+#: project/templates/event/update.html:210
 msgid "Target group"
 msgstr ""
 
@@ -1689,10 +1687,6 @@ msgstr ""
 msgid "Request reference for event \"%(name)s\""
 msgstr ""
 
-#: project/templates/event_place/read.html:19
-msgid "Info"
-msgstr ""
-
 #: project/templates/event_suggestion/review.html:20
 #: project/templates/manage/reviews.html:19
 msgid "Review event suggestion"
@@ -1902,7 +1896,7 @@ msgstr ""
 msgid "Widget"
 msgstr ""
 
-#: project/templates/widget/event_date/list.html:124
+#: project/templates/widget/event_date/list.html:128
 msgid "Print"
 msgstr ""
 
@@ -1980,31 +1974,27 @@ msgstr ""
 msgid "Invitation successfully deleted"
 msgstr ""
 
-#: project/views/event.py:178
+#: project/views/event.py:177
 msgid "Event successfully published"
 msgstr ""
 
-#: project/views/event.py:180
+#: project/views/event.py:179
 msgid "Draft successfully saved"
 msgstr ""
 
-#: project/views/event.py:223
+#: project/views/event.py:222
 msgid "Event successfully updated"
 msgstr ""
 
-#: project/views/event.py:246
-msgid "Entered name does not match event name"
-msgstr ""
-
-#: project/views/event.py:252
+#: project/views/event.py:248
 msgid "Event successfully deleted"
 msgstr ""
 
-#: project/views/event.py:404
+#: project/views/event.py:403
 msgid "Referenced event changed"
 msgstr ""
 
-#: project/views/event.py:427
+#: project/views/event.py:426
 msgid "New event report"
 msgstr ""
 
@@ -2154,7 +2144,7 @@ msgstr ""
 msgid "You do not have permission for this action"
 msgstr ""
 
-#: project/views/utils.py:264
+#: project/views/utils.py:258
 msgid ""
 "The invitation was issued to another user. Sign in with the email address"
 " the invitation was sent to."
diff --git a/project/forms/event.py b/project/forms/event.py
index e16f5ea..c51a734 100644
--- a/project/forms/event.py
+++ b/project/forms/event.py
@@ -37,13 +37,13 @@ class EventDateDefinitionFormMixin:
     start = CustomDateTimeField(
         lazy_gettext("Start"),
         validators=[DataRequired()],
-        description=lazy_gettext("Indicate when the event will take place."),
+        description=lazy_gettext("Indicate when the event date will start."),
     )
     end = CustomDateTimeField(
         lazy_gettext("End"),
         validators=[Optional()],
         description=lazy_gettext(
-            "Indicate when the event will end. An event can last a maximum of 14 days."
+            "Indicate when the event date will end. An event can last a maximum of 14 days."
         ),
     )
     allday = BooleanField(
@@ -235,6 +235,9 @@ class BaseEventForm(SharedEventForm):
         FormField(EventDateDefinitionForm, default=lambda: EventDateDefinition()),
         min_entries=1,
     )
+    date_definition_template = FormField(
+        EventDateDefinitionForm, default=lambda: EventDateDefinition()
+    )
     previous_start_date = CustomDateTimeField(
         lazy_gettext("Previous start date"),
         validators=[Optional()],
@@ -330,6 +333,8 @@ class CreateEventForm(BaseEventForm):
                 field.populate_obj(obj, "organizer")
             elif name == "photo" and not obj.photo:
                 obj.photo = Image()
+            elif name == "date_definition_template":
+                continue
             field.populate_obj(obj, name)
 
         obj.public_status = (
@@ -405,6 +410,8 @@ class UpdateEventForm(BaseEventForm):
         for name, field in self._fields.items():
             if name == "photo" and not obj.photo:
                 obj.photo = Image()
+            elif name == "date_definition_template":
+                continue
             field.populate_obj(obj, name)
 
         if obj.photo and obj.photo.is_empty():
diff --git a/project/models.py b/project/models.py
index f2517ac..00833c1 100644
--- a/project/models.py
+++ b/project/models.py
@@ -909,9 +909,10 @@ class Event(db.Model, TrackableMixin, EventMixin):
     @min_start.expression
     def min_start(cls):
         return (
-            select([EventDateDefinition.end])
+            select([EventDateDefinition.start])
             .where(EventDateDefinition.event_id == cls.id)
             .order_by(EventDateDefinition.start)
+            .limit(1)
             .as_scalar()
         )
 
@@ -938,6 +939,7 @@ class Event(db.Model, TrackableMixin, EventMixin):
 
     date_definitions = relationship(
         "EventDateDefinition",
+        order_by="EventDateDefinition.start",
         backref=backref("event", lazy=False),
         cascade="all, delete-orphan",
     )
diff --git a/project/services/event.py b/project/services/event.py
index 076e658..0d882a5 100644
--- a/project/services/event.py
+++ b/project/services/event.py
@@ -349,7 +349,8 @@ def update_event_dates_with_recurrence_rule(event):
                 None,
             )
             if existing_date:
-                dates_to_remove.remove(existing_date)
+                if existing_date in dates_to_remove:
+                    dates_to_remove.remove(existing_date)
             else:
                 new_date = EventDate(
                     event_id=event.id,
diff --git a/project/static/jquery.recurrenceinput.css b/project/static/jquery.recurrenceinput.css
index 425edba..663c181 100644
--- a/project/static/jquery.recurrenceinput.css
+++ b/project/static/jquery.recurrenceinput.css
@@ -108,3 +108,7 @@ div.errorarea {
   font-weight: bold;
   padding: 2px 10px;
 }
+
+.recc-event-container .form-group {
+  margin-bottom: 0;
+}
diff --git a/project/static/jquery.recurrenceinput.js b/project/static/jquery.recurrenceinput.js
index 76905a7..be0f64e 100644
--- a/project/static/jquery.recurrenceinput.js
+++ b/project/static/jquery.recurrenceinput.js
@@ -207,6 +207,7 @@
         reccStartTime: 'Begin',
         reccFoEndTime: 'End',
         reccAllDay: 'All day',
+        removeEventDate: 'Remove event date',
     });
 
 
@@ -257,15 +258,16 @@
     $.templates('occurrenceTmpl', OCCURRENCETMPL);
 
     var DISPLAYTMPL = ['<div class="ridisplay">',
-        '<div class="rimain bg-light mt-3 p-3 rounded border">',
+        '<div class="rimain">',
             '<div class="mb-2">',
                 '<div class="ridisplay-start"></div>',
                 '<div class="ridisplay-times"></div>',
                 '<div class="ridisplay">{{:i18n.displayUnactivate}}</div>',
             '</div>',
             '{{if !readOnly}}',
-                '<button type="button" name="riedit" class="btn btn-outline-secondary">{{:i18n.add_rules}}</button>',
-                '<button type="button" name="ridelete" class="btn btn-outline-secondary" style="display:none">{{:i18n.delete_rules}}</button>',
+                '<button type="button" name="riedit" class="btn btn-outline-secondary"><i class="fa fa-plus"></i> {{:i18n.add_rules}}</button>',
+                '<button type="button" name="ridelete" class="btn btn-outline-secondary" style="display:none"><i class="fa fa-times-circle"></i> {{:i18n.delete_rules}}</button>',
+                '<button type="button" class="btn btn-outline-secondary remove-date-defintion-btn d-none"><i class="fa fa-calendar-minus"></i> {{:i18n.removeEventDate}}</button>',
             '{{/if}}',
         '</div>',
         '<div class="rioccurrences" style="display:none" /></div>'].join('\n');
@@ -284,37 +286,37 @@
                                 '<div class="modal-body">',
                                     '<div class="riform">',
                                         '<form>',
-                                            '<div id="messagearea" style="display: none;">',
+                                            '<div id="{{:prefix}}messagearea" style="display: none;">',
                                             '</div>',
 
                                             '<div class="form-row">',
                                                 '<div class="form-group col-md-4">',
-                                                    '<label class="mb-0" for="recc-start">{{:i18n.reccStart}}</label>',
-                                                    '<input type="text" class="form-control datepicker" data-range-to="#recc-end" data-allday="#recc-allday" id="recc-start" name="recc-start" required="" />',
+                                                    '<label class="mb-0" for="{{:prefix}}recc-start">{{:i18n.reccStart}}</label>',
+                                                    '<input type="text" class="form-control datepicker" data-range-to="#{{:prefix}}recc-end" data-allday="#{{:prefix}}recc-allday" id="{{:prefix}}recc-start" name="recc-start" required="" />',
                                                 '</div>',
 
-                                                '<div class="form-group col-md-4" id="recc-start-time-group">',
-                                                    '<label class="mb-0" for="recc-start-time">{{:i18n.reccStartTime}}</label>',
-                                                    '<input type="text" class="form-control timepicker" id="recc-start-time" name="recc-start-time" required="" />',
+                                                '<div class="form-group col-md-4" id="{{:prefix}}recc-start-time-group">',
+                                                    '<label class="mb-0" for="{{:prefix}}recc-start-time">{{:i18n.reccStartTime}}</label>',
+                                                    '<input type="text" class="form-control timepicker" id="{{:prefix}}recc-start-time" name="recc-start-time" required="" />',
                                                 '</div>',
 
-                                                '<div class="form-group col-md-4" id="recc-fo-end-time-group">',
-                                                    '<label class="mb-0" for="recc-fo-end-time">{{:i18n.reccFoEndTime}}</label>',
-                                                    '<input type="text" class="form-control timepicker" id="recc-fo-end-time" name="recc-fo-end-time" />',
+                                                '<div class="form-group col-md-4" id="{{:prefix}}recc-fo-end-time-group">',
+                                                    '<label class="mb-0" for="{{:prefix}}recc-fo-end-time">{{:i18n.reccFoEndTime}}</label>',
+                                                    '<input type="text" class="form-control timepicker" id="{{:prefix}}recc-fo-end-time" name="recc-fo-end-time" />',
                                                 '</div>',
                                             '</div>',
 
                                             '<div class="form-row">',
                                                 '<div class="form-group col-md">',
                                                     '<div class="form-check">',
-                                                        '<input class="form-check-input" id="recc-allday" name="recc-allday" type="checkbox" value="y">',
-                                                        '<label class="form-check-label" for="recc-allday">{{:i18n.reccAllDay}}</label>',
+                                                        '<input class="form-check-input" id="{{:prefix}}recc-allday" name="recc-allday" type="checkbox" value="y">',
+                                                        '<label class="form-check-label" for="{{:prefix}}recc-allday">{{:i18n.reccAllDay}}</label>',
                                                     '</div>',
                                                 '</div>',
                                             '</div>',
 
                                             '<div class="form-row">',
-                                                '<div id="rirangeoptions" class="form-group col-md">',
+                                                '<div id="{{:prefix}}rirangeoptions" class="form-group col-md">',
                                                     '<label class="mb-0">{{:i18n.range}}</label>',
                                                         '<div class="input-group mb-1">',
                                                             '<div class="input-group-prepend">',
@@ -325,14 +327,14 @@
                                                                         'value="BYENDDATE"',
                                                                         'name="rirangetype"',
                                                                         'class="form-check-inline"',
-                                                                        'id="{{:name}}rangetype:BYENDDATE"/>',
+                                                                        'id="{{:prefix}}{{:name}}rangetype:BYENDDATE"/>',
                                                                     '{{:i18n.rangeByEndDate}}',
                                                                 '</div>',
                                                             '</div>',
                                                             '<input',
                                                                 'type="text"',
                                                                 'class="form-control"',
-                                                                'name="rirangebyenddatecalendar" id="recc-end" />',
+                                                                'name="rirangebyenddatecalendar" id="{{:prefix}}recc-end" />',
                                                         '</div>',
                                                         '<div class="input-group mb-1">',
                                                             '<div class="input-group-prepend">',
@@ -342,7 +344,7 @@
                                                                         'value="BYOCCURRENCES"',
                                                                         'name="rirangetype"',
                                                                         'class="form-check-inline"',
-                                                                        'id="{{:name}}rangetype:BYOCCURRENCES"/>',
+                                                                        'id="{{:prefix}}{{:name}}rangetype:BYOCCURRENCES"/>',
                                                                     '{{:i18n.rangeByOccurrences1}}',
                                                                 '</div>',
                                                             '</div>',
@@ -365,7 +367,7 @@
                                                                     'value="NOENDDATE"',
                                                                     'name="rirangetype"',
                                                                     'class="form-check-inline"',
-                                                                    'id="{{:name}}rangetype:NOENDDATE"/>',
+                                                                    'id="{{:prefix}}{{:name}}rangetype:NOENDDATE"/>',
                                                                 '{{:i18n.rangeNoEnd}}',
                                                             '</div>',
                                                         '</div>',
@@ -378,7 +380,7 @@
                                                     '<label for="{{:name}}rtemplate" class="mb-0">',
                                                         '{{:i18n.recurrenceType}}',
                                                     '</label>',
-                                                    '<select id="rirtemplate" name="rirtemplate" class="form-control">',
+                                                    '<select id="{{:prefix}}rirtemplate" name="rirtemplate" class="form-control">',
                                                         '{{props rtemplate}}',
                                                             '<option value="{{>key}}">{{:~root.i18n.rtemplate[key]}}</value>',
                                                         '{{/props}}',
@@ -386,7 +388,7 @@
                                                 '</div>',
 
                                                 '<div class="col-md">',
-                                                    '<div id="ridailyinterval" class="form-group rifield">',
+                                                    '<div id="{{:prefix}}ridailyinterval" class="form-group rifield">',
                                                         '<label for="{{:name}}dailyinterval" class="mb-0">',
                                                             '{{:i18n.dailyInterval1}}',
                                                         '</label>',
@@ -395,7 +397,7 @@
                                                                 'value="1"',
                                                                 'name="ridailyinterval"',
                                                                 'class="form-control"',
-                                                                'id="{{:name}}dailyinterval" />',
+                                                                'id="{{:prefix}}{{:name}}dailyinterval" />',
                                                             '<div class="input-group-append">',
                                                                 '<span class="input-group-text">',
                                                                     '{{:i18n.dailyInterval2}}',
@@ -403,7 +405,7 @@
                                                             '</div>',
                                                         '</div>',
                                                     '</div>',
-                                                    '<div id="riweeklyinterval" class="form-group rifield">',
+                                                    '<div id="{{:prefix}}riweeklyinterval" class="form-group rifield">',
                                                         '<label for="{{:name}}weeklyinterval" class="mb-0">',
                                                             '{{:i18n.weeklyInterval1}}',
                                                         '</label>',
@@ -412,7 +414,7 @@
                                                                 'value="1"',
                                                                 'name="riweeklyinterval"',
                                                                 'class="form-control"',
-                                                                'id="{{:name}}riweeklyinterval" />',
+                                                                'id="{{:prefix}}{{:name}}riweeklyinterval" />',
                                                             '<div class="input-group-append">',
                                                                 '<span class="input-group-text">',
                                                                     '{{:i18n.weeklyInterval2}}',
@@ -420,7 +422,7 @@
                                                             '</div>',
                                                         '</div>',
                                                     '</div>',
-                                                    '<div id="rimonthlyinterval" class="form-group rifield">',
+                                                    '<div id="{{:prefix}}rimonthlyinterval" class="form-group rifield">',
                                                         '<label for="rimonthlyinterval" class="mb-0">{{:i18n.monthlyInterval1}}</label>',
                                                         '<div class="input-group">',
                                                             '<input type="text" size="2"',
@@ -434,7 +436,7 @@
                                                             '</div>',
                                                         '</div>',
                                                     '</div>',
-                                                    '<div id="riyearlyinterval" class="form-group rifield">',
+                                                    '<div id="{{:prefix}}riyearlyinterval" class="form-group rifield">',
                                                         '<label for="riyearlyinterval" class="mb-0">{{:i18n.yearlyInterval1}}</label>',
                                                         '<div class="input-group">',
                                                             '<input type="text" size="2"',
@@ -451,14 +453,14 @@
                                                 '</div>',
                                             '</div>',
 
-                                            '<div id="riweeklyweekdays" class="form-group rifield">',
+                                            '<div id="{{:prefix}}riweeklyweekdays" class="form-group rifield">',
                                                 '<label for="{{:name}}weeklyinterval" class="mb-0">{{:i18n.weeklyWeekdays}}</label>',
                                                 '<div>',
                                                     '{{for orderedWeekdays itemVar=\'~value\'}}',
                                                         '<div class="form-check form-check-inline">',
                                                             '<input type="checkbox"',
                                                                 'name="riweeklyweekdays{{:~root.weekdays[~value]}}"',
-                                                                'id="{{:name}}weeklyWeekdays{{:~root.weekdays[~value]}}"',
+                                                                'id="{{:prefix}}{{:name}}weeklyWeekdays{{:~root.weekdays[~value]}}"',
                                                                 'class="form-check-input"',
                                                                 'value="{{:~root.weekdays[~value]}}" />',
                                                             '<label for="{{:name}}weeklyWeekdays{{:~root.weekdays[~value]}}" class="form-check-label">{{:~root.i18n.shortWeekdays[~value]}}</label>',
@@ -466,7 +468,7 @@
                                                     '{{/for}}',
                                                 '</div>',
                                             '</div>',
-                                            '<div id="rimonthlyoptions" class="form-group rifield">',
+                                            '<div id="{{:prefix}}rimonthlyoptions" class="form-group rifield">',
                                                 '<label for="rimonthlytype" class="mb-0">{{:i18n.monthlyRepeatOn}}</label>',
                                                 '<div>',
                                                     '<div class="input-group mb-1">',
@@ -477,12 +479,12 @@
                                                                     'value="DAYOFMONTH"',
                                                                     'name="rimonthlytype"',
                                                                     'class="form-check-inline"',
-                                                                    'id="{{:name}}monthlytype:DAYOFMONTH" />',
+                                                                    'id="{{:prefix}}{{:name}}monthlytype:DAYOFMONTH" />',
                                                                 '{{:i18n.monthlyDayOfMonth1}}',
                                                             '</div>',
                                                         '</div>',
                                                         '<select name="rimonthlydayofmonthday" class="form-control"',
-                                                            'id="{{:name}}monthlydayofmonthday">',
+                                                            'id="{{:prefix}}{{:name}}monthlydayofmonthday">',
                                                         '{{for start=1 end=32}}',
                                                             '<option value="{{:}}">{{:}}</option>',
                                                         '{{/for}}',
@@ -501,7 +503,7 @@
                                                                     'value="WEEKDAYOFMONTH"',
                                                                     'name="rimonthlytype"',
                                                                     'class="form-check-inline"',
-                                                                    'id="{{:name}}monthlytype:WEEKDAYOFMONTH" />',
+                                                                    'id="{{:prefix}}{{:name}}monthlytype:WEEKDAYOFMONTH" />',
                                                                 '{{:i18n.monthlyWeekdayOfMonth1}}',
                                                             '</div>',
                                                         '</div>',
@@ -523,7 +525,7 @@
                                                     '</div>',
                                                 '</div>',
                                             '</div>',
-                                            '<div id="riyearlyoptions" class="form-group rifield">',
+                                            '<div id="{{:prefix}}riyearlyoptions" class="form-group rifield">',
                                                 '<label for="riyearlyType" class="mb-0">{{:i18n.yearlyRepeatOn}}</label>',
                                                 '<div>',
                                                     '<div class="input-group mb-1">',
@@ -534,7 +536,7 @@
                                                                     'value="DAYOFMONTH"',
                                                                     'name="riyearlyType"',
                                                                     'class="form-check-inline"',
-                                                                    'id="{{:name}}yearlytype:DAYOFMONTH" />',
+                                                                    'id="{{:prefix}}{{:name}}yearlytype:DAYOFMONTH" />',
                                                                 '{{:i18n.yearlyDayOfMonth1}}',
                                                             '</div>',
                                                         '</div>',
@@ -557,7 +559,7 @@
                                                                     'value="WEEKDAYOFMONTH"',
                                                                     'name="riyearlyType"',
                                                                     'class="form-check-inline"',
-                                                                    'id="{{:name}}yearlytype:WEEKDAYOFMONTH"/>',
+                                                                    'id="{{:prefix}}{{:name}}yearlytype:WEEKDAYOFMONTH"/>',
                                                             '{{:i18n.yearlyWeekdayOfMonth1}}',
                                                             '</div>',
                                                         '</div>',
@@ -585,10 +587,10 @@
                                                 '</div>',
                                             '</div>',
 
-                                            '<div id="occurences-show-container">',
-                                                '<a href="#" class="show-link" data-container="occurences-container" data-show-container="occurences-show-container"><i class="fa fa-chevron-down"></i> {{:i18n.preview}}</a>',
+                                            '<div id="{{:prefix}}occurences-show-container">',
+                                                '<a href="#" class="show-link" data-container="{{:prefix}}occurences-container" data-show-container="{{:prefix}}occurences-show-container"><i class="fa fa-chevron-down"></i> {{:i18n.preview}}</a>',
                                             '</div>',
-                                            '<div id="occurences-container" style="display: none;">',
+                                            '<div id="{{:prefix}}occurences-container" style="display: none;">',
                                                 '<div class="rioccurrencesactions">',
                                                     '<div class="rioccurancesheader">',
                                                         '<h2 class="my-2">{{:i18n.preview}}',
@@ -609,15 +611,15 @@
                                                             '<div class="input-group-prepend">',
                                                                 '<span class="input-group-text">{{:i18n.addDate}}</span>',
                                                             '</div>',
-                                                            '<input type="text" class="form-control" name="adddate" id="adddate" />',
+                                                            '<input type="text" class="form-control" name="adddate" id="{{:prefix}}adddate" />',
                                                             '<div class="input-group-append">',
-                                                                '<input type="button" class="btn btn-outline-secondary" name="addoccurencebtn" id="addoccurencebtn" value="{{:i18n.add}}" />',
+                                                                '<input type="button" class="btn btn-outline-secondary" name="addoccurencebtn" id="{{:prefix}}addoccurencebtn" value="{{:i18n.add}}" />',
                                                             '</div>',
                                                         '</div>',
                                                     '</div>',
                                                 '</div>',
-                                                '<div class="mt-3" id="occurences-hide-container">',
-                                                    '<a href="#" class="hide-link" data-container="occurences-container" data-show-container="occurences-show-container"><i class="fa fa-chevron-up"></i> {{:i18n.preview}}</a>',
+                                                '<div class="mt-3" id="{{:prefix}}occurences-hide-container">',
+                                                    '<a href="#" class="hide-link" data-container="{{:prefix}}occurences-container" data-show-container="{{:prefix}}occurences-show-container"><i class="fa fa-chevron-up"></i> {{:i18n.preview}}</a>',
                                                 '</div>',
                                             '</div>',
                                         '</form>',
@@ -649,9 +651,9 @@
         var day, month, year, interval, yearlyType, occurrences, date;
 
         for (i = 0; i < rtemplate.fields.length; i++) {
-            field = form.find('#' + rtemplate.fields[i]);
+            field = form.find('#' + conf.prefix + rtemplate.fields[i]);
 
-            switch (field.attr('id')) {
+            switch (rtemplate.fields[i]) {
 
             case 'ridailyinterval':
                 interval = field.find('input[name=ridailyinterval]').val();
@@ -1017,8 +1019,8 @@
             }
 
             for (i = 0; i < rtemplate.fields.length; i++) {
-                field = form.find('#' + rtemplate.fields[i]);
-                switch (field.attr('id')) {
+                field = form.find('#' + conf.prefix + rtemplate.fields[i]);
+                switch (rtemplate.fields[i]) {
 
                 case 'ridailyinterval':
                     field.find('input[name=ridailyinterval]').val(interval);
@@ -1150,7 +1152,7 @@
             }
         }
 
-        var messagearea = form.find('#messagearea');
+        var messagearea = form.find('#' + conf.prefix + 'messagearea');
         if (unsupportedFeatures.length !== 0) {
             messagearea.text(conf.i18n.unsupportedFeatures + ' ' + unsupportedFeatures.join('; '));
             messagearea.show();
@@ -1200,7 +1202,7 @@
             if (value) {
                 var rtemplate = conf.rtemplate[value];
                 for (i = 0; i < rtemplate.fields.length; i++) {
-                    form.find('#' + rtemplate.fields[i]).show();
+                    form.find('#' + conf.prefix + rtemplate.fields[i]).show();
                 }
             }
         }
@@ -1241,7 +1243,7 @@
         function occurrenceAdd(event) {
             event.preventDefault();
             var dateinput = form
-                .find('.riaddoccurrence input#adddate');
+                .find('.riaddoccurrence input#' + conf.prefix + 'adddate');
             var datevalue = $.datepicker.formatDate("yymmdd", dateinput.data('picker').datepicker("getDate")) + 'T000000';
             if (form.ical.RDATE === undefined) {
                 form.ical.RDATE = [];
@@ -1382,7 +1384,7 @@
             var startdate = null;
             var startField, startFieldYear, startFieldMonth, startFieldDay;
 
-            var startField = 'recc-start'; // conf.startField;
+            var startField = conf.prefix + 'recc-start'; // conf.startField;
 
             // Find the default byday and bymonthday from the start date, if any:
             if (startField) {
@@ -1541,7 +1543,7 @@
             // if (startdate !== null) {
             //     loadOccurrences(startdate, widgetSaveToRfc5545(form, conf, false).result, 0, true);
             // }
-            display.find('button[name="riedit"]').text(conf.i18n.edit_rules);
+            display.find('button[name="riedit"]').html('<i class="fa fa-edit"></i> ' + conf.i18n.edit_rules);
             display.find('button[name="ridelete"]').show();
 
             displayOn();
@@ -1557,7 +1559,7 @@
             label.text(conf.i18n.displayUnactivate);
             textarea.val('').change();  // Clear the textarea.
             display.find('.rioccurrences').hide();
-            display.find('button[name="riedit"]').text(conf.i18n.add_rules);
+            display.find('button[name="riedit"]').html('<i class="fa fa-plus"></i>' + conf.i18n.add_rules);
             display.find('button[name="ridelete"]').hide();
 
             set_picker_date($('#' + conf.prefix + 'end-user'), null);
@@ -1571,7 +1573,7 @@
             startDate = findStartDate();
 
             // Hide any error message from before
-            messagearea = form.find('#messagearea');
+            messagearea = form.find('#' + conf.prefix + 'messagearea');
             messagearea.text('');
             messagearea.hide();
 
@@ -1579,7 +1581,7 @@
             form.find('.riaddoccurrence div.errorarea').text('').hide();
 
             // Repeats Daily
-            if (form.find('#ridailyinterval').css('display') === 'block') {
+            if (form.find('#' + conf.prefix + 'ridailyinterval').css('display') === 'block') {
                 // Check repeat every field
                 num = findIntField('ridailyinterval', form);
                 if (!num || num < 1 || num > 1000) {
@@ -1589,7 +1591,7 @@
             }
 
             // Repeats Weekly
-            if (form.find('#riweeklyinterval').css('display') === 'block') {
+            if (form.find('#' + conf.prefix + 'riweeklyinterval').css('display') === 'block') {
                 // Check repeat every field
                 num = findIntField('riweeklyinterval', form);
                 if (!num || num < 1 || num > 1000) {
@@ -1599,7 +1601,7 @@
             }
 
             // Repeats Monthly
-            if (form.find('#rimonthlyinterval').css('display') === 'block') {
+            if (form.find('#' + conf.prefix + 'rimonthlyinterval').css('display') === 'block') {
                 // Check repeat every field
                 num = findIntField('rimonthlyinterval', form);
                 if (!num || num < 1 || num > 1000) {
@@ -1615,7 +1617,7 @@
             }
 
             // Repeats Yearly
-            if (form.find('#riyearlyinterval').css('display') === 'block') {
+            if (form.find('#' + conf.prefix + 'riyearlyinterval').css('display') === 'block') {
                 // Check repeat every field
                 num = findIntField('riyearlyinterval', form);
                 if (!num || num < 1 || num > 1000) {
@@ -1781,7 +1783,11 @@
                 recc_fo_end_time.timepicker('option', 'minTime', $(this).timepicker("getTime"));
             });
 
-            form.find('input[id=recc-start-user]').datepicker("setDate", $('#' + conf.prefix + 'start-user').datepicker("getDate"));
+            var recc_start_picker = form.find('input[id=' + conf.prefix + 'recc-start-user]');
+            var start_date = $('#' + conf.prefix + 'start-user').datepicker("getDate");
+            recc_start_picker.datepicker("setDate", start_date);
+            set_date_bounds(recc_start_picker);
+
             recc_start_time.timepicker('setTime', $('#' + conf.prefix + 'start-time').timepicker("getTime"));
             recc_start_time.change();
             recc_fo_end_time.timepicker('setTime', $('#' + conf.prefix + 'end-time').timepicker("getTime"));
@@ -1789,8 +1795,8 @@
             var recc_allday = form.find('input[name=recc-allday]');
             recc_allday.prop('checked', $('#' + conf.prefix + 'allday').is(':checked'));
             var allday_checked = recc_allday.is(':checked');
-            var recc_start_time_group = form.find("#recc-start-time-group");
-            var recc_fo_end_time_group = form.find('#recc-fo-end-time-group');
+            var recc_start_time_group = form.find("#" + conf.prefix + "recc-start-time-group");
+            var recc_fo_end_time_group = form.find("#" + conf.prefix + "recc-fo-end-time-group");
             recc_start_time_group.toggle(!allday_checked);
             recc_fo_end_time_group.toggle(!allday_checked);
 
@@ -1798,7 +1804,7 @@
                 recc_start_time_group.toggle(!this.checked);
                 recc_fo_end_time_group.toggle(!this.checked);
 
-                onAlldayChecked(this, "recc-start");
+                onAlldayChecked(this, conf.prefix + "recc-start");
 
                 var end_moment = get_moment_with_time_from_fields(form.find('input[name=recc-start]'), form.find('input[name=recc-start-time]'));
                 if (this.checked) {
@@ -1809,11 +1815,11 @@
                 recc_fo_end_time.timepicker('setTime', end_moment.toDate());
             });
 
-            form.find('#occurences-show-container .show-link').click(function(e){
+            form.find('#' + conf.prefix + 'occurences-show-container .show-link').click(function(e){
                 showLink(e, this);
             });
 
-            form.find('#occurences-hide-container .hide-link').click(function(e){
+            form.find('#' + conf.prefix + 'occurences-hide-container .hide-link').click(function(e){
                 hideLink(e, this);
             });
 
@@ -1822,9 +1828,9 @@
         });
 
         // Pop up the little add form when clicking "Add"
-        var riaddoccurrence_input = form.find('div.riaddoccurrence input#adddate');
+        var riaddoccurrence_input = form.find('div.riaddoccurrence input#' + conf.prefix + 'adddate');
         start_datepicker(riaddoccurrence_input).datepicker("setDate", moment().toDate());
-        form.find('input#addoccurencebtn').click(occurrenceAdd);
+        form.find('input#' + conf.prefix + 'addoccurencebtn').click(occurrenceAdd);
 
         // When the reload button is clicked, reload
         form.find('a.rirefreshbutton').click(
@@ -1876,7 +1882,7 @@
         form.find('.risavebutton').click(save);
 
         $('#' + conf.prefix + 'recc-button').click(function() {
-            $('button[name=riedit]').click();
+            display.find('button[name="riedit"]').click();
         });
 
         /*
@@ -1926,12 +1932,12 @@
 jQuery.tools.recurrenceinput.localize("de", {
     displayUnactivate: "Keine Wiederholungen",
     displayActivate: "Alle ",
-    edit_rules: "Bearbeiten...",
+    edit_rules: "Serie bearbeiten...",
     add_rules: "Hinzufügen...",
-    delete_rules: "Löschen",
+    delete_rules: "Serie zurücksetzen",
     add: "Hinzufügen",
     refresh: "Aktualisieren",
-    title: "Regelmäßige Veranstaltung",
+    title: "Serientermin",
     preview: "Ausgewählte Termine",
     addDate: "Termin hinzufügen",
     recurrenceType: "Wiederholt sich",
@@ -2050,4 +2056,5 @@ jQuery.tools.recurrenceinput.localize("de", {
     reccStartTime: "Beginn",
     reccFoEndTime: "Ende",
     reccAllDay: "Ganztägig",
+    removeEventDate: 'Termin entfernen',
   });
\ No newline at end of file
diff --git a/project/static/site.js b/project/static/site.js
index 8451d71..0a31eb6 100644
--- a/project/static/site.js
+++ b/project/static/site.js
@@ -369,14 +369,15 @@ function scroll_to_element(element, complete) {
     var alldayInput = container.find("input[id$='-allday']");
     var recurrenceRuleTextarea = container.find("textarea[id$='-recurrence_rule']");
 
-    start_datepicker(startInput);
-    start_datepicker(endInput);
-
     start_timepicker(startTimeInput);
     start_timepicker(endTimeInput);
 
+    start_datepicker(startInput);
+    start_datepicker(endInput);
+
     recurrenceRuleTextarea.recurrenceinput({prefix: prefix, ajaxURL: "/events/rrule"});
 
+    var removeButton = container.find("button.remove-date-defintion-btn");
     var startUserInput = container.find("input[id$='-start-user']");
     var endUserInput = container.find("input[id$='-end-user']");
 
@@ -409,6 +410,28 @@ function scroll_to_element(element, complete) {
       }
     });
 
+    removeButton.click(function () {
+      var count = $.find(".date-definition-container").length;
+      if (count > 1) {
+          var container = $(this).closest(".date-definition-container");
+          container.remove();
+          count--;
+
+          if (count == 1) {
+            $('.date-definition-container button.remove-date-defintion-btn').addClass("d-none");
+          }
+      }
+
+      return false;
+    });
+
+    container.find(".show-link").click(function (e) {
+      showLink(e, this);
+    });
+
+    container.find(".hide-link").click(function (e) {
+      hideLink(e, this);
+    });
   }
 
   $.fn.ovedaDateDefinition = function(options) {
@@ -433,11 +456,11 @@ function scroll_to_element(element, complete) {
 $(function () {
   $('[data-toggle="tooltip"]').tooltip();
 
-  $(".datepicker").each(function (index, element) {
+  $("form .datepicker").each(function (index, element) {
     start_datepicker($(element));
   });
 
-  $(".timepicker").each(function (index, element) {
+  $("form .timepicker").each(function (index, element) {
     start_timepicker($(element));
   });
 
diff --git a/project/templates/_macros.html b/project/templates/_macros.html
index 5c408a6..1ed4324 100644
--- a/project/templates/_macros.html
+++ b/project/templates/_macros.html
@@ -667,7 +667,7 @@
             <h2 class="mt-0"><a name="event-dates">{{ _('Event Dates') }}</a></div>
           <div class="list-group list-group-flush mb-4" style="max-height: 30vh; overflow: scroll; overflow-y: auto;">
           {% for date in dates %}
-              <a href="{{ url_for('event_date', id=date.id) }}" class="list-group-item">{{ date.start | dateformat('full') }}</a>
+              <a href="{{ url_for('event_date', id=date.id) }}" class="list-group-item">{{ render_event_date(date.start, date.end, date.allday) }}</a>
           {% endfor %}
           </div>
       </div>
@@ -1645,4 +1645,64 @@ $('#allday').on('change', function() {
 <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='jquery.recurrenceinput.css')}}" />
 {% endmacro %}
 
+{% macro render_event_date_defintion_code() %}
+      $('.date-definition-container').ovedaDateDefinition();
+      var min_date_definition_index = $(".date-definition-container").length;
+      if (min_date_definition_index > 1) {
+        $('.date-definition-container button.remove-date-defintion-btn').removeClass("d-none");
+      }
+
+      $("#add-date-defintion-btn").click(function () {
+        var template = $(".date-definition-template");
+        var template_prefix = template.attr('data-prefix');
+
+        var last_container = $(".date-definition-container:last");
+        var last_prefix = last_container.attr('data-prefix');
+        var new_index = Math.max(min_date_definition_index, $(".date-definition-container").length);
+        min_date_definition_index++;
+
+        var new_prefix = last_prefix.replace(/-(\d+)-$/g, function(match, number) {
+              return '-' + new_index + '-';
+        });
+
+        var new_container = template.clone();
+        new_container.removeClass('date-definition-template');
+        new_container.removeClass('d-none');
+        new_container.addClass('date-definition-container');
+        new_container.attr('data-prefix', new_prefix);
+        new_container.find("*").each(function() {
+          var subelement = $(this);
+          $.each(this.attributes, function(i, attrib) {
+            subelement.attr(attrib.name, attrib.value.replace(template_prefix, new_prefix));
+          });
+        });
+
+        last_container.after(new_container);
+        new_container.ovedaDateDefinition();
+
+        if ($.find(".date-definition-container").length > 1) {
+          $('.date-definition-container button.remove-date-defintion-btn').removeClass("d-none");
+        }
+        return false;
+      });
+{% endmacro %}
+
+{% macro render_date_definition_container(date_definition, container_class="date-definition-container") %}
+<div class="{{ container_class }} card mb-3 bg-light" data-prefix="{{ date_definition.id }}-">
+  <div class="card-body">
+    <div id="{{ date_definition.id }}-single-event-container">
+      {{ date_definition.form.hidden_tag() }}
+      {{ render_field_with_errors(date_definition.form.start, **{"data-range-to":"#"+date_definition.form.end.id, "data-range-max-days": "14", "data-allday": "#"+date_definition.form.allday.id}) }}
+      {{ render_field_with_errors(date_definition.form.end, is_collapsible=1) }}
+      {{ render_field_with_errors(date_definition.form.allday, ri="checkbox") }}
+
+      <button type="button" id="{{ date_definition.id }}-recc-button" class="btn btn-outline-secondary"><i class="fas fa-history"></i> {{ _('Recurring event') }}</button>
+      <button type="button" class="btn btn-outline-secondary remove-date-defintion-btn d-none"><i class="fa fa-calendar-minus"></i> {{ _('Remove event date') }}</button>
+    </div>
+    <div id="{{ date_definition.id }}-recc-event-container" class="recc-event-container">
+      {{ render_field_with_errors(date_definition.form.recurrence_rule, label_hidden=True) }}
+    </div>
+  </div>
+</div>
+{% endmacro %}
 
diff --git a/project/templates/event/create.html b/project/templates/event/create.html
index f939382..b47c87a 100644
--- a/project/templates/event/create.html
+++ b/project/templates/event/create.html
@@ -1,5 +1,5 @@
 {% extends "layout.html" %}
-{% from "_macros.html" import render_manage_form_styles, render_manage_form_scripts, render_cropper_header, render_end_container_handling, render_jquery_steps_header, render_cropper_header, render_cropper_code, render_crop_image_form_section, render_radio_buttons, render_field_with_errors, render_field %}
+{% from "_macros.html" import render_event_date_defintion_code, render_date_definition_container, render_manage_form_styles, render_manage_form_scripts, render_cropper_header, render_end_container_handling, render_jquery_steps_header, render_cropper_header, render_cropper_code, render_crop_image_form_section, render_radio_buttons, render_field_with_errors, render_field %}
 
 {%- block title -%}
 {{ _('Create event') }}
@@ -56,7 +56,7 @@ $( function() {
         }
     });
 
-    $('.date-definition-container').ovedaDateDefinition();
+    {{ render_event_date_defintion_code() }}
 
   function update_place_container(value) {
     switch (value) {
@@ -240,6 +240,8 @@ $( function() {
 
 <h1>{{ _('Create event') }}</h1>
 
+{{ render_date_definition_container(form.date_definition_template, "date-definition-template d-none") }}
+
 <form id="main-form" action="" method="POST" enctype="multipart/form-data">
   {{ form.hidden_tag() }}
 
@@ -255,22 +257,14 @@ $( function() {
 
   <div class="card mb-4">
     <div class="card-header">
-      {{ _('Event date') }}
+      {{ _('Event dates') }}
     </div>
-    <div class="card-body">
+    <div class="card-body pb-3">
       {% for date_definition in form.date_definitions %}
-        <div class="date-definition-container" data-prefix="{{ date_definition.id }}-">
-          <div id="{{ date_definition.id }}-single-event-container">
-            {{ render_field_with_errors(date_definition.form.start, **{"data-range-to":"#"+date_definition.form.end.id, "data-range-max-days": "14", "data-allday": "#"+date_definition.form.allday.id}) }}
-            {{ render_field_with_errors(date_definition.form.allday, ri="checkbox") }}
-            {{ render_field_with_errors(date_definition.form.end, is_collapsible=1) }}
-            <button type="button" id="{{ date_definition.id }}-recc-button" class="btn btn-outline-secondary"><i class="fas fa-history"></i> {{ _('Recurring event') }}</button>
-          </div>
-          <div id="{{ date_definition.id }}-recc-event-container">
-            {{ render_field_with_errors(date_definition.form.recurrence_rule) }}
-          </div>
-        </div>
+        {{ render_date_definition_container(date_definition) }}
       {% endfor %}
+
+      <button type="button" class="btn btn-outline-secondary btn-small" id="add-date-defintion-btn"><i class="fa fa-calendar-plus"></i> {{ _('Add event date') }}</button>
     </div>
   </div>
 
diff --git a/project/templates/event/update.html b/project/templates/event/update.html
index 4800a27..eea6e78 100644
--- a/project/templates/event/update.html
+++ b/project/templates/event/update.html
@@ -1,5 +1,5 @@
 {% extends "layout.html" %}
-{% from "_macros.html" import render_manage_form_styles, render_manage_form_scripts, render_cropper_header, render_end_container_handling, render_jquery_steps_header, render_cropper_code, render_crop_image_form_section, render_radio_buttons, render_field_with_errors, render_field %}
+{% from "_macros.html" import render_event_date_defintion_code, render_date_definition_container, render_manage_form_styles, render_manage_form_scripts, render_cropper_header, render_end_container_handling, render_jquery_steps_header, render_cropper_code, render_crop_image_form_section, render_radio_buttons, render_field_with_errors, render_field %}
 
 {%- block title -%}
 {{ _('Update event') }}
@@ -27,7 +27,7 @@
             }
         });
 
-      $('.date-definition-container').ovedaDateDefinition();
+      {{ render_event_date_defintion_code() }}
 
       // Organizer
       var organizer_select =$('#organizer_id');
@@ -131,6 +131,8 @@
 
 <h1>{{ _('Update event') }}</h1>
 
+{{ render_date_definition_container(form.date_definition_template, "date-definition-template d-none") }}
+
 <form id="main-form" action="{{ url_for('event_update', event_id=event.id) }}" method="POST" enctype="multipart/form-data">
   {{ form.hidden_tag() }}
 
@@ -146,22 +148,14 @@
 
   <div class="card mb-4">
     <div class="card-header">
-      {{ _('Event date') }}
+      {{ _('Event dates') }}
     </div>
-    <div class="card-body">
+    <div class="card-body pb-3">
       {% for date_definition in form.date_definitions %}
-        <div class="date-definition-container" data-prefix="{{ date_definition.id }}-">
-          <div id="{{ date_definition.id }}-single-event-container">
-            {{ render_field_with_errors(date_definition.form.start, **{"data-range-to":"#"+date_definition.form.end.id, "data-range-max-days": "14", "data-allday": "#"+date_definition.form.allday.id}) }}
-            {{ render_field_with_errors(date_definition.form.allday, ri="checkbox") }}
-            {{ render_field_with_errors(date_definition.form.end, is_collapsible=1) }}
-            <button type="button" id="{{ date_definition.id }}-recc-button" class="btn btn-outline-secondary"><i class="fas fa-history"></i> {{ _('Recurring event') }}</button>
-          </div>
-          <div id="{{ date_definition.id }}-recc-event-container">
-            {{ render_field_with_errors(date_definition.form.recurrence_rule) }}
-          </div>
-        </div>
+        {{ render_date_definition_container(date_definition) }}
       {% endfor %}
+
+      <button type="button" class="btn btn-outline-secondary btn-small" id="add-date-defintion-btn"><i class="fa fa-calendar-plus"></i> {{ _('Add event date') }}</button>
     </div>
   </div>
 
diff --git a/project/translations/de/LC_MESSAGES/messages.mo b/project/translations/de/LC_MESSAGES/messages.mo
index fe8eb15..13124d5 100644
Binary files a/project/translations/de/LC_MESSAGES/messages.mo and b/project/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/project/translations/de/LC_MESSAGES/messages.po b/project/translations/de/LC_MESSAGES/messages.po
index 2488d5b..a3c4a0c 100644
--- a/project/translations/de/LC_MESSAGES/messages.po
+++ b/project/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-04 16:04+0100\n"
+"POT-Creation-Date: 2021-11-14 16:26+0100\n"
 "PO-Revision-Date: 2020-06-07 18:51+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -205,7 +205,7 @@ msgstr "Nutzungsbedingungen"
 msgid "Legal notice"
 msgstr "Impressum"
 
-#: project/forms/admin.py:12 project/templates/_macros.html:1412
+#: project/forms/admin.py:12 project/templates/_macros.html:1383
 #: project/templates/layout.html:317
 #: project/templates/widget/event_suggestion/create.html:204
 #: project/views/admin_unit.py:73 project/views/root.py:53
@@ -316,12 +316,11 @@ msgstr "Breitengrad"
 msgid "Longitude"
 msgstr "Längengrad"
 
-#: project/forms/admin_unit.py:29 project/forms/event.py:36
-#: project/forms/event.py:65 project/forms/event.py:398
-#: project/forms/event_place.py:25 project/forms/event_place.py:50
-#: project/forms/event_suggestion.py:26 project/forms/oauth2_client.py:66
-#: project/forms/organizer.py:25 project/forms/organizer.py:52
-#: project/forms/reference_request.py:23 project/templates/_macros.html:135
+#: project/forms/admin_unit.py:29 project/forms/event.py:85
+#: project/forms/event.py:114 project/forms/event_place.py:25
+#: project/forms/event_place.py:50 project/forms/event_suggestion.py:26
+#: project/forms/oauth2_client.py:66 project/forms/organizer.py:25
+#: project/forms/organizer.py:52 project/forms/reference_request.py:23
 #: project/templates/admin/admin_units.html:19
 #: project/templates/event_place/list.html:19
 #: project/templates/oauth2_client/list.html:25
@@ -339,32 +338,32 @@ msgstr ""
 "eindeutig zu identifizieren. Der Kurzname darf nur Buchstaben, Nummern "
 "und Unterstriche enthalten."
 
-#: project/forms/admin_unit.py:41 project/templates/_macros.html:1548
+#: project/forms/admin_unit.py:41 project/templates/_macros.html:1519
 msgid "Short name must contain only letters numbers or underscore"
 msgstr "Der Kurzname darf nur Buchstaben, Nummern und Unterstriche enthalten"
 
-#: project/forms/admin_unit.py:47 project/forms/event.py:57
-#: project/forms/event.py:95 project/forms/event_place.py:26
+#: project/forms/admin_unit.py:47 project/forms/event.py:106
+#: project/forms/event.py:124 project/forms/event_place.py:26
 #: project/forms/organizer.py:26
 msgid "Link URL"
 msgstr "Link URL"
 
 #: project/forms/admin_unit.py:48 project/forms/admin_unit_member.py:11
 #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
-#: project/forms/event.py:58 project/forms/event_suggestion.py:38
-#: project/forms/organizer.py:27 project/templates/_macros.html:262
-#: project/templates/_macros.html:1508 project/templates/admin/users.html:19
+#: project/forms/event.py:107 project/forms/event_suggestion.py:38
+#: project/forms/organizer.py:27 project/templates/_macros.html:226
+#: project/templates/_macros.html:1479 project/templates/admin/users.html:19
 msgid "Email"
 msgstr "Email"
 
-#: project/forms/admin_unit.py:49 project/forms/event.py:59
+#: project/forms/admin_unit.py:49 project/forms/event.py:108
 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28
-#: project/templates/_macros.html:315
+#: project/templates/_macros.html:279
 msgid "Phone"
 msgstr "Telefon"
 
-#: project/forms/admin_unit.py:50 project/forms/event.py:60
-#: project/forms/organizer.py:29 project/templates/_macros.html:323
+#: project/forms/admin_unit.py:50 project/forms/event.py:109
+#: project/forms/organizer.py:29 project/templates/_macros.html:287
 msgid "Fax"
 msgstr "Fax"
 
@@ -455,7 +454,7 @@ msgstr "Copyright Text"
 msgid "Image"
 msgstr "Bild"
 
-#: project/forms/common.py:72
+#: project/forms/common.py:71
 #, python-format
 msgid ""
 "I read and accept %(tos_open)sTerms of Service%(tos_close)s and "
@@ -465,115 +464,122 @@ msgstr ""
 "%(privacy_open)sDatenschutzerklärung%(privacy_close)s gelesen und "
 "akzeptiere diese."
 
-#: project/forms/common.py:83
+#: project/forms/common.py:82
 msgid "0 (Little relevant)"
 msgstr "0 (Wenig relevant)"
 
-#: project/forms/common.py:88
+#: project/forms/common.py:87
 msgid "5 (Default)"
 msgstr "5 (Standard)"
 
-#: project/forms/common.py:93
+#: project/forms/common.py:92
 msgid "10 (Highlight)"
 msgstr "10 (Highlight)"
 
-#: project/forms/common.py:97
+#: project/forms/common.py:96
 msgid "Monday"
 msgstr "Montag"
 
-#: project/forms/common.py:98
+#: project/forms/common.py:97
 msgid "Tueday"
 msgstr "Dienstag"
 
-#: project/forms/common.py:99
+#: project/forms/common.py:98
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: project/forms/common.py:100
+#: project/forms/common.py:99
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: project/forms/common.py:101
+#: project/forms/common.py:100
 msgid "Friday"
 msgstr "Freitag"
 
-#: project/forms/common.py:102
+#: project/forms/common.py:101
 msgid "Saturday"
 msgstr "Samstag"
 
-#: project/forms/common.py:103
+#: project/forms/common.py:102
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: project/forms/common.py:107
+#: project/forms/common.py:106
 msgid "500 m"
 msgstr "500 m"
 
-#: project/forms/common.py:108
+#: project/forms/common.py:107
 msgid "5 km"
 msgstr "5 km"
 
-#: project/forms/common.py:109
+#: project/forms/common.py:108
 msgid "10 km"
 msgstr "10 km"
 
-#: project/forms/common.py:110
+#: project/forms/common.py:109
 msgid "20 km"
 msgstr "20 km"
 
-#: project/forms/common.py:111
+#: project/forms/common.py:110
 msgid "50 km"
 msgstr "50 km"
 
-#: project/forms/common.py:112
+#: project/forms/common.py:111
 msgid "100 km"
 msgstr "100 km"
 
-#: project/forms/event.py:54
-msgid "Organizator"
-msgstr "Veranstalter"
-
-#: project/forms/event.py:67
-msgid "Enter a short, meaningful name for the event."
-msgstr "Gib einen kurzen, aussagekräftigen Namen für die Veranstaltung ein."
-
-#: project/forms/event.py:70
+#: project/forms/event.py:38
 msgid "Start"
 msgstr "Beginn"
 
-#: project/forms/event.py:72
-msgid "Indicate when the event will take place."
-msgstr "Gib an, wann die Veranstaltung stattfindet."
+#: project/forms/event.py:40
+msgid "Indicate when the event date will start."
+msgstr "Gib an, wann der Termin beginnt."
 
-#: project/forms/event.py:75
+#: project/forms/event.py:43
 msgid "End"
 msgstr "Ende"
 
-#: project/forms/event.py:77
-msgid "Indicate when the event will end. An event can last a maximum of 14 days."
-msgstr ""
-"Gib an, wann die Veranstaltung endet. Eine Veranstaltung darf maximal 14 "
-"Tage dauern."
+#: project/forms/event.py:45
+msgid ""
+"Indicate when the event date will end. An event can last a maximum of 14 "
+"days."
+msgstr "Gib an, wann der Termin endet. Ein Termin darf maximal 14 Tage dauern."
 
-#: project/forms/event.py:82 project/templates/planing/list.html:75
+#: project/forms/event.py:50 project/templates/planing/list.html:75
 msgid "All-day"
 msgstr "Ganztägig"
 
-#: project/forms/event.py:86 project/templates/event/create.html:274
-#: project/templates/event/update.html:165
+#: project/forms/event.py:54 project/templates/_macros.html:1699
 #: project/templates/widget/event_suggestion/create.html:240
 msgid "Recurring event"
-msgstr "Regelmäßige Veranstaltung"
+msgstr "Serientermin"
 
-#: project/forms/event.py:90 project/forms/event_place.py:28
+#: project/forms/event.py:61 project/templates/_macros.html:1240
+msgid "The start must be before the end."
+msgstr "Der Start muss vor dem Ende sein."
+
+#: project/forms/event.py:67 project/templates/_macros.html:1257
+msgid "An event can last a maximum of 14 days."
+msgstr "Eine Veranstaltung darf maximal 14 Tage dauern."
+
+#: project/forms/event.py:103
+msgid "Organizator"
+msgstr "Veranstalter"
+
+#: project/forms/event.py:116
+msgid "Enter a short, meaningful name for the event."
+msgstr "Gib einen kurzen, aussagekräftigen Namen für die Veranstaltung ein."
+
+#: project/forms/event.py:119 project/forms/event_place.py:28
 msgid "Description"
 msgstr "Beschreibung"
 
-#: project/forms/event.py:92
+#: project/forms/event.py:121
 msgid "Add an description of the event."
 msgstr "Füge der Veranstaltung eine Beschreibung hinzu."
 
-#: project/forms/event.py:97
+#: project/forms/event.py:126
 msgid ""
 "Enter a link to an external website containing more information about the"
 " event."
@@ -581,19 +587,19 @@ msgstr ""
 "Gib einen Link zu einer externen Website ein, die weitere Informationen "
 "zur Veranstaltung enthält."
 
-#: project/forms/event.py:102
+#: project/forms/event.py:131
 msgid "Ticket Link URL"
 msgstr "Ticket Link"
 
-#: project/forms/event.py:104
+#: project/forms/event.py:133
 msgid "Enter a link where tickets can be purchased."
 msgstr "Gib einen Link ein, über den Tickets gekauft werden können."
 
-#: project/forms/event.py:107 project/templates/_macros.html:244
+#: project/forms/event.py:136 project/templates/_macros.html:208
 msgid "Tags"
 msgstr "Stichworte"
 
-#: project/forms/event.py:109
+#: project/forms/event.py:138
 msgid ""
 "Enter keywords with which the event should be found. Words do not need to"
 " be entered if they are already in the name or description."
@@ -602,68 +608,68 @@ msgstr ""
 "Worte müssen nicht eingegeben werden, wenn sie bereits im Namen oder in "
 "der Beschreibung enthalten sind."
 
-#: project/forms/event.py:114
+#: project/forms/event.py:143
 msgid "Kid friendly"
 msgstr "Für Kinder geeignet"
 
-#: project/forms/event.py:116
+#: project/forms/event.py:145
 msgid "If the event is particularly suitable for children."
 msgstr "Wenn die Veranstaltung besonders für Kinder geeignet ist."
 
-#: project/forms/event.py:119
+#: project/forms/event.py:148
 msgid "Accessible for free"
 msgstr "Kostenlos zugänglich"
 
-#: project/forms/event.py:121
+#: project/forms/event.py:150
 msgid "If the event is accessible for free."
 msgstr "Wenn die Veranstaltung kostenlos zugänglich ist."
 
-#: project/forms/event.py:124
+#: project/forms/event.py:153
 msgid "Typical Age from"
 msgstr "Typisches Alter von"
 
-#: project/forms/event.py:126
+#: project/forms/event.py:155
 msgid "The minimum age that participants should be."
 msgstr "Das Mindestalter, das die Teilnehmer haben sollten."
 
-#: project/forms/event.py:129
+#: project/forms/event.py:158
 msgid "Typical Age to"
 msgstr "Typisches Alter bis"
 
-#: project/forms/event.py:131
+#: project/forms/event.py:160
 msgid "The maximum age that participants should be."
 msgstr "Das maximale Alter, das die Teilnehmer haben sollten."
 
-#: project/forms/event.py:134
+#: project/forms/event.py:163
 msgid "Registration required"
 msgstr "Anmeldung erforderlich"
 
-#: project/forms/event.py:136
+#: project/forms/event.py:165
 msgid "If the participants needs to register for the event."
 msgstr "Wenn sich die Teilnehmer für die Veranstaltung anmelden müssen."
 
-#: project/forms/event.py:141 project/templates/_macros.html:276
+#: project/forms/event.py:170 project/templates/_macros.html:240
 #: project/templates/layout.html:128
 msgid "Booked up"
 msgstr "Ausgebucht"
 
-#: project/forms/event.py:143
+#: project/forms/event.py:172
 msgid "If the event is booked up or sold out."
 msgstr "Wenn die Veranstaltung ausgebucht oder ausverkauft ist."
 
-#: project/forms/event.py:146
+#: project/forms/event.py:175
 msgid "Expected number of participants"
 msgstr "Erwartete Teilnehmerzahl"
 
-#: project/forms/event.py:148
+#: project/forms/event.py:177
 msgid "The estimated expected attendance."
 msgstr "Die geschätzte erwartete Teilnehmerzahl."
 
-#: project/forms/event.py:151
+#: project/forms/event.py:180
 msgid "Price info"
 msgstr "Preisinformation"
 
-#: project/forms/event.py:153
+#: project/forms/event.py:182
 msgid ""
 "Enter price information in textual form. E.g., different prices for "
 "adults and children."
@@ -671,23 +677,23 @@ msgstr ""
 "Gib die Preisinformationen in Textform ein. Z.B. unterschiedliche Preise "
 "für Erwachsene und Kinder."
 
-#: project/forms/event.py:158
+#: project/forms/event.py:187
 msgid "Target group origin"
 msgstr "Für Touristen/Einwohner geeignet"
 
-#: project/forms/event.py:163
+#: project/forms/event.py:192
 msgid "EventTargetGroupOrigin.both"
 msgstr "Für Touristen und Einwohner"
 
-#: project/forms/event.py:167
+#: project/forms/event.py:196
 msgid "EventTargetGroupOrigin.tourist"
 msgstr "Hauptsächlich für Touristen"
 
-#: project/forms/event.py:171
+#: project/forms/event.py:200
 msgid "EventTargetGroupOrigin.resident"
 msgstr "Hauptsächlich für Einwohner"
 
-#: project/forms/event.py:174
+#: project/forms/event.py:203
 msgid ""
 "Choose whether the event is particularly suitable for tourists or "
 "residents."
@@ -695,32 +701,32 @@ msgstr ""
 "Wähle, ob die Veranstaltung besonders für Touristen oder Einwohner "
 "geeignet ist."
 
-#: project/forms/event.py:179
+#: project/forms/event.py:208
 msgid "Attendance mode"
 msgstr "Teilnahme"
 
-#: project/forms/event.py:184
+#: project/forms/event.py:213
 msgid "EventAttendanceMode.offline"
 msgstr "Präsenzveranstaltung"
 
-#: project/forms/event.py:188 project/templates/layout.html:116
+#: project/forms/event.py:217 project/templates/layout.html:116
 msgid "EventAttendanceMode.online"
 msgstr "Online"
 
-#: project/forms/event.py:190 project/templates/layout.html:119
+#: project/forms/event.py:219 project/templates/layout.html:119
 msgid "EventAttendanceMode.mixed"
 msgstr "Präsenzveranstaltung und online"
 
-#: project/forms/event.py:192
+#: project/forms/event.py:221
 msgid "Choose how people can attend the event."
 msgstr "Wähle aus, wie Personen an der Veranstaltung teilnehmen können."
 
-#: project/forms/event.py:196 project/forms/event_place.py:27
+#: project/forms/event.py:225 project/forms/event_place.py:27
 #: project/templates/widget/event_suggestion/create.html:258
 msgid "Photo"
 msgstr "Foto"
 
-#: project/forms/event.py:198
+#: project/forms/event.py:227
 msgid ""
 "We recommend uploading a photo for the event. It looks a lot more, but of"
 " course it works without it."
@@ -728,41 +734,33 @@ msgstr ""
 "Wir empfehlen dir, ein Foto für die Veranstaltung hochzuladen. Es macht "
 "schon deutlich mehr her, aber es geht natürlich auch ohne."
 
-#: project/forms/event.py:208 project/templates/_macros.html:1269
-msgid "The start must be before the end."
-msgstr "Der Start muss vor dem Ende sein."
-
-#: project/forms/event.py:214 project/templates/_macros.html:1286
-msgid "An event can last a maximum of 14 days."
-msgstr "Eine Veranstaltung darf maximal 14 Tage dauern."
-
-#: project/forms/event.py:222 project/templates/_macros.html:423
-#: project/templates/_macros.html:586
+#: project/forms/event.py:242 project/templates/_macros.html:387
+#: project/templates/_macros.html:550
 msgid "Previous start date"
 msgstr "Vorheriges Startdatum"
 
-#: project/forms/event.py:224
+#: project/forms/event.py:244
 msgid "Enter when the event should have taken place before it was postponed."
 msgstr ""
 "Gib ein, wann die Veranstaltung hätte stattfinden sollen, bevor sie "
 "verschoben wurde."
 
-#: project/forms/event.py:229 project/forms/event_suggestion.py:71
+#: project/forms/event.py:249 project/forms/event_suggestion.py:71
 msgid "Categories"
 msgstr "Kategorien"
 
-#: project/forms/event.py:232 project/forms/event_suggestion.py:74
+#: project/forms/event.py:252 project/forms/event_suggestion.py:74
 msgid "Choose categories that fit the event."
 msgstr "Wähle Kategorien, die zur Veranstaltung passen."
 
-#: project/forms/event.py:235 project/forms/reference.py:14
+#: project/forms/event.py:255 project/forms/reference.py:14
 #: project/forms/reference.py:27 project/forms/reference_request.py:76
-#: project/templates/event/create.html:390
-#: project/templates/event/update.html:246
+#: project/templates/event/create.html:379
+#: project/templates/event/update.html:235
 msgid "Rating"
 msgstr "Bewertung"
 
-#: project/forms/event.py:239 project/forms/reference.py:18
+#: project/forms/event.py:259 project/forms/reference.py:18
 #: project/forms/reference.py:31 project/forms/reference_request.py:80
 msgid ""
 "Choose how relevant the event is to your organization. The value is not "
@@ -771,11 +769,11 @@ msgstr ""
 "Wähle aus, wie relevant die Veranstaltung für deine Organisation ist. Der"
 " Wert ist nicht sichtbar und dient der Sortierung."
 
-#: project/forms/event.py:244
+#: project/forms/event.py:264
 msgid "Co-organizers"
 msgstr "Mitveranstalter"
 
-#: project/forms/event.py:247
+#: project/forms/event.py:267
 msgid ""
 "Select optional co-organizers. You can add and modify organizers at "
 "Organization > Organizers."
@@ -783,65 +781,65 @@ msgstr ""
 "Wähle optionale Mitveranstalter. Du kannst Veranstalter unter "
 "Organisation > Veranstalter hinzufügen und ändern."
 
-#: project/forms/event.py:257
+#: project/forms/event.py:277
 msgid "Invalid co-organizer."
 msgstr "Ungültiger Mitveranstalter."
 
-#: project/forms/event.py:266 project/forms/event.py:275
-#: project/forms/event.py:344 project/forms/event_suggestion.py:50
-#: project/templates/_macros.html:463 project/templates/_macros.html:623
-#: project/templates/event/create.html:315
-#: project/templates/event/update.html:196
+#: project/forms/event.py:286 project/forms/event.py:295
+#: project/forms/event.py:368 project/forms/event_suggestion.py:50
+#: project/templates/_macros.html:427 project/templates/_macros.html:587
+#: project/templates/event/create.html:304
+#: project/templates/event/update.html:185
 #: project/templates/event_place/create.html:31
 #: project/templates/event_place/delete.html:13
 #: project/templates/event_place/update.html:31
 msgid "Place"
 msgstr "Ort"
 
-#: project/forms/event.py:268
+#: project/forms/event.py:288
 msgid "Select existing place"
 msgstr "Vorhandenen Ort auswählen"
 
-#: project/forms/event.py:269
+#: project/forms/event.py:289
 msgid "Enter new place"
 msgstr "Neuen Ort eingeben"
 
-#: project/forms/event.py:282 project/forms/event.py:291
-#: project/forms/event.py:352 project/forms/event.py:414
-#: project/forms/event_suggestion.py:60 project/templates/_macros.html:500
-#: project/templates/_macros.html:660 project/templates/event/create.html:284
-#: project/templates/event/update.html:186
+#: project/forms/event.py:302 project/forms/event.py:311
+#: project/forms/event.py:376 project/forms/event.py:439
+#: project/forms/event_suggestion.py:60 project/templates/_macros.html:464
+#: project/templates/_macros.html:624 project/templates/event/create.html:273
+#: project/templates/event/update.html:175
 #: project/templates/organizer/create.html:27
 #: project/templates/organizer/delete.html:13
 #: project/templates/organizer/update.html:27
 msgid "Organizer"
 msgstr "Veranstalter"
 
-#: project/forms/event.py:284
+#: project/forms/event.py:304
 msgid "Select existing organizer"
 msgstr "Vorhandenen Veranstalter auswählen"
 
-#: project/forms/event.py:285
+#: project/forms/event.py:305
 msgid "Enter new organizer"
 msgstr "Neuen Veranstalter eingeben"
 
-#: project/forms/event.py:297
+#: project/forms/event.py:317
 msgid "Save as draft"
 msgstr "Als Entwurf speichern"
 
-#: project/forms/event.py:298
+#: project/forms/event.py:318
 msgid "Publish event"
 msgstr "Veranstaltung veröffentlichen"
 
-#: project/forms/event.py:328
+#: project/forms/event.py:350
 msgid "Select existing place or enter new place"
 msgstr "Existierenden Ort wählen oder neuen Ort eingeben"
 
-#: project/forms/event.py:335
+#: project/forms/event.py:358
 msgid "Select existing organizer or enter new organizer"
 msgstr "Wähle einen vorhandenen Veranstalter oder gib einen neuen Veranstalter ein"
 
-#: project/forms/event.py:347
+#: project/forms/event.py:371
 msgid ""
 "Choose where the event takes place. You can add and modify places at "
 "Organization > Places."
@@ -849,7 +847,7 @@ msgstr ""
 "Wähle, wo die Veranstaltung stattfindet. Du kannst Orte unter "
 "Organisation > Orte hinzufügen und ändern."
 
-#: project/forms/event.py:355
+#: project/forms/event.py:379
 msgid ""
 "Select the organizer. You can add and modify organizers at Organization >"
 " Organizers."
@@ -857,91 +855,91 @@ msgstr ""
 "Wähle den Veranstalter. Du kannst Veranstalter unter Organisation > "
 "Veranstalter hinzufügen und ändern."
 
-#: project/forms/event.py:361 project/templates/event/update.html:175
+#: project/forms/event.py:385 project/templates/event/update.html:164
 #: project/templates/oauth2_token/list.html:21
 msgid "Status"
 msgstr "Status"
 
-#: project/forms/event.py:364
+#: project/forms/event.py:388
 msgid "EventStatus.scheduled"
 msgstr "Geplant"
 
-#: project/forms/event.py:365 project/templates/layout.html:82
+#: project/forms/event.py:389 project/templates/layout.html:82
 #: project/templates/layout.html:97
 msgid "EventStatus.cancelled"
 msgstr "Abgesagt"
 
-#: project/forms/event.py:366 project/templates/layout.html:85
+#: project/forms/event.py:390 project/templates/layout.html:85
 #: project/templates/layout.html:100
 msgid "EventStatus.movedOnline"
 msgstr "Online verschoben"
 
-#: project/forms/event.py:367 project/templates/layout.html:88
+#: project/forms/event.py:391 project/templates/layout.html:88
 #: project/templates/layout.html:103
 msgid "EventStatus.postponed"
 msgstr "Verschoben"
 
-#: project/forms/event.py:368 project/templates/layout.html:91
+#: project/forms/event.py:392 project/templates/layout.html:91
 #: project/templates/layout.html:106
 msgid "EventStatus.rescheduled"
 msgstr "Neu angesetzt"
 
-#: project/forms/event.py:370
+#: project/forms/event.py:394
 msgid "Select the status of the event."
 msgstr "Wähle den Status der Veranstaltung."
 
-#: project/forms/event.py:374
+#: project/forms/event.py:398
 msgid "Public status"
 msgstr "Öffentlicher Status"
 
-#: project/forms/event.py:377
+#: project/forms/event.py:401
 msgid "PublicStatus.published"
 msgstr "Veröffentlicht"
 
-#: project/forms/event.py:378 project/templates/_macros.html:282
+#: project/forms/event.py:402 project/templates/_macros.html:246
 msgid "PublicStatus.draft"
 msgstr "Entwurf"
 
-#: project/forms/event.py:380
+#: project/forms/event.py:404
 msgid "Select the public status of the event."
 msgstr "Wähle den öffentlichen Status der Veranstaltung."
 
-#: project/forms/event.py:383 project/templates/event/update.html:5
-#: project/templates/event/update.html:141
+#: project/forms/event.py:407 project/templates/event/update.html:5
+#: project/templates/event/update.html:132
 msgid "Update event"
 msgstr "Veranstaltung aktualisieren"
 
-#: project/forms/event.py:397 project/templates/_macros.html:1241
+#: project/forms/event.py:423 project/templates/_macros.html:1212
 #: project/templates/event/actions.html:47
 #: project/templates/event/delete.html:6
 msgid "Delete event"
 msgstr "Veranstaltung löschen"
 
-#: project/forms/event.py:405 project/forms/event_date.py:15
+#: project/forms/event.py:430 project/forms/event_date.py:15
 #: project/forms/planing.py:14
 msgid "From"
 msgstr "Von"
 
-#: project/forms/event.py:407 project/forms/event_date.py:17
+#: project/forms/event.py:432 project/forms/event_date.py:17
 #: project/forms/planing.py:16
 msgid "to"
 msgstr "bis"
 
-#: project/forms/event.py:409 project/forms/event_date.py:19
+#: project/forms/event.py:434 project/forms/event_date.py:19
 msgid "Keyword"
 msgstr "Stichwort"
 
-#: project/forms/event.py:411 project/forms/event_date.py:21
-#: project/forms/planing.py:19 project/templates/_macros.html:396
+#: project/forms/event.py:436 project/forms/event_date.py:21
+#: project/forms/planing.py:19 project/templates/_macros.html:360
 msgid "Category"
 msgstr "Kategorie"
 
-#: project/forms/event.py:417
+#: project/forms/event.py:442
 msgid "Find events"
 msgstr "Veranstaltungen finden"
 
 #: project/forms/event_date.py:24 project/forms/planing.py:22
-#: project/templates/_macros.html:137 project/templates/_macros.html:330
+#: project/templates/_macros.html:294
 #: project/templates/admin_unit/create.html:38
 #: project/templates/admin_unit/update.html:39
 #: project/templates/event_place/create.html:40
@@ -967,8 +965,7 @@ msgstr "Finden"
 msgid "Create place"
 msgstr "Ort hinzufügen"
 
-#: project/forms/event_place.py:45 project/templates/event_place/read.html:12
-#: project/templates/event_place/update.html:5
+#: project/forms/event_place.py:45 project/templates/event_place/update.html:5
 #: project/templates/event_place/update.html:21
 msgid "Update place"
 msgstr "Ort aktualisieren"
@@ -997,7 +994,7 @@ msgstr "Bitte gib deine Email-Adresse oder deine Telefonnummer für die Prüfung
 msgid "I would like to be notified by email after the review"
 msgstr "Ich möchte per Email benachrichtigt werden nach der Prüfung"
 
-#: project/forms/event_suggestion.py:52 project/templates/event/create.html:320
+#: project/forms/event_suggestion.py:52 project/templates/event/create.html:309
 msgid ""
 "Choose where the event takes place. If the venue is not yet in the list, "
 "just enter it."
@@ -1005,7 +1002,7 @@ msgstr ""
 "Wähle aus, wo die Veranstaltung stattfindet. Ist der Veranstaltungsort "
 "noch nicht in der Liste, trage ihn einfach ein."
 
-#: project/forms/event_suggestion.py:62 project/templates/event/create.html:288
+#: project/forms/event_suggestion.py:62 project/templates/event/create.html:277
 msgid ""
 "Select the organizer. If the organizer is not yet on the list, just enter"
 " it."
@@ -1019,27 +1016,27 @@ msgstr ""
 msgid "Create event suggestion"
 msgstr "Veranstaltung vorschlagen"
 
-#: project/forms/event_suggestion.py:116 project/forms/reference_request.py:48
+#: project/forms/event_suggestion.py:124 project/forms/reference_request.py:48
 msgid "Rejection reason"
 msgstr "Ablehnungsgrund"
 
-#: project/forms/event_suggestion.py:121
+#: project/forms/event_suggestion.py:129
 msgid "EventRejectionReason.noreason"
 msgstr "Ohne Grund"
 
-#: project/forms/event_suggestion.py:125
+#: project/forms/event_suggestion.py:133
 msgid "EventRejectionReason.duplicate"
 msgstr "Duplikat"
 
-#: project/forms/event_suggestion.py:129
+#: project/forms/event_suggestion.py:137
 msgid "EventRejectionReason.untrustworthy"
 msgstr "Unseriös"
 
-#: project/forms/event_suggestion.py:133
+#: project/forms/event_suggestion.py:141
 msgid "EventRejectionReason.illegal"
 msgstr "Unzulässig"
 
-#: project/forms/event_suggestion.py:138
+#: project/forms/event_suggestion.py:146
 #: project/templates/event_suggestion/reject.html:9
 #: project/templates/event_suggestion/review.html:33
 #: project/templates/event_suggestion/review.html:40
@@ -1089,7 +1086,7 @@ msgid "Weekdays"
 msgstr "Wochentage"
 
 #: project/forms/reference.py:11 project/forms/reference_request.py:16
-#: project/templates/_macros.html:516 project/templates/_macros.html:676
+#: project/templates/_macros.html:480 project/templates/_macros.html:640
 #: project/templates/admin_unit/create.html:28
 #: project/templates/admin_unit/update.html:29
 #: project/templates/layout.html:258
@@ -1117,7 +1114,7 @@ msgstr "Anfrage speichern"
 msgid "Delete request"
 msgstr "Anfrage löschen"
 
-#: project/forms/reference_request.py:28 project/templates/_macros.html:1424
+#: project/forms/reference_request.py:28 project/templates/_macros.html:1395
 #: project/templates/event_suggestion/review_status.html:18
 #: project/templates/reference_request/review_status.html:12
 msgid "Review status"
@@ -1179,110 +1176,100 @@ msgstr "Ablehnen"
 msgid "This field is required."
 msgstr "Dieses Feld ist erforderlich."
 
-#: project/templates/_macros.html:134 project/templates/_macros.html:418
-#: project/templates/_macros.html:937
-msgid "Date"
-msgstr "Datum"
-
-#: project/templates/_macros.html:136
-msgid "Host"
-msgstr "Veranstalter"
-
-#: project/templates/_macros.html:158
-msgid "Show all events"
-msgstr "Alle Veranstaltungen anzeigen"
-
-#: project/templates/_macros.html:174
+#: project/templates/_macros.html:138
 msgid "Show on Google Maps"
 msgstr "Auf Google Maps anzeigen"
 
-#: project/templates/_macros.html:253
+#: project/templates/_macros.html:217
 msgid "Link"
 msgstr "Link"
 
-#: project/templates/_macros.html:309
+#: project/templates/_macros.html:273
 msgid "Verified"
 msgstr "Verifiziert"
 
-#: project/templates/_macros.html:373
+#: project/templates/_macros.html:337
 #, python-format
 msgid "Created at %(created_at)s by %(created_by)s."
 msgstr "Erstellt am %(created_at)s von %(created_by)s."
 
-#: project/templates/_macros.html:375
+#: project/templates/_macros.html:339
 #, python-format
 msgid "Created at %(created_at)s."
 msgstr "Erstellt am %(created_at)s."
 
-#: project/templates/_macros.html:380
+#: project/templates/_macros.html:344
 #, python-format
 msgid "Last updated at %(updated_at)s by %(updated_by)s."
 msgstr "Zuletzt aktualisiert am %(updated_at)s von %(updated_by)s."
 
-#: project/templates/_macros.html:382
+#: project/templates/_macros.html:346
 #, python-format
 msgid "Last updated at %(updated_at)s."
 msgstr "Zuletzt aktualisiert am %(updated_at)s."
 
-#: project/templates/_macros.html:412 project/templates/_macros.html:582
+#: project/templates/_macros.html:376 project/templates/_macros.html:546
 #: project/templates/event/actions.html:12
-#: project/templates/event/create.html:257
-#: project/templates/event/delete.html:13
-#: project/templates/event/update.html:148
+#: project/templates/event/create.html:250
+#: project/templates/event/update.html:141
 #: project/templates/widget/event_suggestion/create.html:229
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: project/templates/_macros.html:445 project/templates/_macros.html:604
-#: project/templates/_macros.html:1493 project/templates/event/actions.html:32
+#: project/templates/_macros.html:382 project/templates/_macros.html:908
+msgid "Date"
+msgstr "Datum"
+
+#: project/templates/_macros.html:409 project/templates/_macros.html:568
+#: project/templates/_macros.html:1464 project/templates/event/actions.html:32
 msgid "Share"
 msgstr "Teilen"
 
-#: project/templates/_macros.html:449 project/templates/_macros.html:608
-#: project/templates/_macros.html:1523
+#: project/templates/_macros.html:413 project/templates/_macros.html:572
+#: project/templates/_macros.html:1494
 msgid "Add to calendar"
 msgstr "Zum Kalender"
 
-#: project/templates/_macros.html:457 project/templates/_macros.html:616
+#: project/templates/_macros.html:421 project/templates/_macros.html:580
 #: project/templates/event/report.html:4
 msgid "Report event"
 msgstr "Veranstaltung melden"
 
-#: project/templates/_macros.html:484 project/templates/_macros.html:642
+#: project/templates/_macros.html:448 project/templates/_macros.html:606
 msgid "Show directions"
 msgstr "Anreise planen"
 
-#: project/templates/_macros.html:489 project/templates/_macros.html:647
+#: project/templates/_macros.html:453 project/templates/_macros.html:611
 msgid "The event takes place online."
 msgstr "Die Veranstaltung findet online statt."
 
-#: project/templates/_macros.html:491 project/templates/_macros.html:649
+#: project/templates/_macros.html:455 project/templates/_macros.html:613
 msgid "The event takes place both offline and online."
 msgstr ""
 "Die Veranstaltung findet sowohl als Präsenzveranstaltung als auch online "
 "statt."
 
-#: project/templates/_macros.html:703 project/templates/event_date/list.html:5
+#: project/templates/_macros.html:667 project/templates/event_date/list.html:5
 #: project/templates/event_date/list.html:300
 #: project/templates/reference_request/review.html:32
 msgid "Event Dates"
 msgstr "Termine"
 
-#: project/templates/_macros.html:795
+#: project/templates/_macros.html:759
 msgid "Search location on Google"
 msgstr "Ort bei Google suchen"
 
-#: project/templates/_macros.html:861
+#: project/templates/_macros.html:825
 #, python-format
 msgid "%(count)d event dates"
 msgstr "%(count)d Termine"
 
-#: project/templates/_macros.html:877 project/templates/_macros.html:879
+#: project/templates/_macros.html:848 project/templates/_macros.html:850
 #: project/templates/event_date/list.html:321
 msgid "First"
 msgstr "Letzte"
 
-#: project/templates/_macros.html:882 project/templates/_macros.html:884
+#: project/templates/_macros.html:853 project/templates/_macros.html:855
 #: project/templates/event_date/list.html:322
 #: project/templates/widget/event_suggestion/create.html:193
 #: project/templates/widget/event_suggestion/create.html:218
@@ -1293,12 +1280,12 @@ msgstr "Letzte"
 msgid "Previous"
 msgstr "Zurück"
 
-#: project/templates/_macros.html:886
+#: project/templates/_macros.html:857
 #, python-format
 msgid "Page %(page)d of %(pages)d (%(total)d total)"
 msgstr "Seite %(page)d von %(pages)d (%(total)d insgesamt)"
 
-#: project/templates/_macros.html:888 project/templates/_macros.html:890
+#: project/templates/_macros.html:859 project/templates/_macros.html:861
 #: project/templates/event_date/list.html:324
 #: project/templates/widget/event_suggestion/create.html:194
 #: project/templates/widget/event_suggestion/create.html:219
@@ -1308,76 +1295,80 @@ msgstr "Seite %(page)d von %(pages)d (%(total)d insgesamt)"
 msgid "Next"
 msgstr "Weiter"
 
-#: project/templates/_macros.html:893 project/templates/_macros.html:895
+#: project/templates/_macros.html:864 project/templates/_macros.html:866
 #: project/templates/event_date/list.html:325
 msgid "Last"
 msgstr "Erste"
 
-#: project/templates/_macros.html:960
+#: project/templates/_macros.html:931
 msgid "Radius"
 msgstr "Umkreis"
 
-#: project/templates/_macros.html:1170
+#: project/templates/_macros.html:1141
 msgid "Edit image"
 msgstr "Bild bearbeiten"
 
-#: project/templates/_macros.html:1191
+#: project/templates/_macros.html:1162
 msgid "Close"
 msgstr "Schließen"
 
-#: project/templates/_macros.html:1192
+#: project/templates/_macros.html:1163
 msgid "Okay"
 msgstr "OK"
 
-#: project/templates/_macros.html:1204
+#: project/templates/_macros.html:1175
 msgid "Choose image file"
 msgstr "Bild-Datei auswählen"
 
-#: project/templates/_macros.html:1240 project/templates/event/actions.html:46
+#: project/templates/_macros.html:1211 project/templates/event/actions.html:46
 msgid "Edit event"
 msgstr "Veranstaltung bearbeiten"
 
-#: project/templates/_macros.html:1243 project/templates/manage/events.html:45
+#: project/templates/_macros.html:1214 project/templates/manage/events.html:45
 msgid "More"
 msgstr "Mehr"
 
-#: project/templates/_macros.html:1290
+#: project/templates/_macros.html:1261
 msgid "Please enter a valid time, between 00:00 and 23:59."
 msgstr "Bitte gib eine gültige Uhrzeit zwischen 00:00 und 23:59 ein."
 
-#: project/templates/_macros.html:1318
+#: project/templates/_macros.html:1289
 #, python-format
 msgid "Just use %(term)s"
 msgstr "Verwende einfach %(term)s"
 
-#: project/templates/_macros.html:1384
+#: project/templates/_macros.html:1355
 msgid "Event suggestion"
 msgstr "Veranstaltungsvorschlag"
 
-#: project/templates/_macros.html:1502
+#: project/templates/_macros.html:1473
 msgid "Link copied"
 msgstr "Link kopiert"
 
-#: project/templates/_macros.html:1502
+#: project/templates/_macros.html:1473
 msgid "Copy link"
 msgstr "Link kopieren"
 
-#: project/templates/_macros.html:1531
+#: project/templates/_macros.html:1502
 msgid "Google calendar"
 msgstr "Google Kalender"
 
-#: project/templates/_macros.html:1532
+#: project/templates/_macros.html:1503
 msgid "Apple calendar"
 msgstr "Apple Kalender"
 
-#: project/templates/_macros.html:1533
+#: project/templates/_macros.html:1504
 msgid "Yahoo calendar"
 msgstr "Yahoo Kalender"
 
-#: project/templates/_macros.html:1534
+#: project/templates/_macros.html:1505
 msgid "Other calendar"
 msgstr "Anderer Kalender"
 
+#: project/templates/_macros.html:1700
+msgid "Remove event date"
+msgstr "Termin entfernen"
+
 #: project/templates/home.html:28
 msgid "Manage"
 msgstr "Verwaltung"
@@ -1387,8 +1378,8 @@ msgstr "Verwaltung"
 msgid "Register for free"
 msgstr "Kostenlos registrieren"
 
-#: project/templates/event_place/read.html:22 project/templates/layout.html:175
-#: project/templates/layout.html:219 project/templates/manage/events.html:6
+#: project/templates/layout.html:175 project/templates/layout.html:219
+#: project/templates/manage/events.html:6
 #: project/templates/manage/events.html:24
 msgid "Events"
 msgstr "Veranstaltungen"
@@ -1430,7 +1421,7 @@ msgid "Show events"
 msgstr "Veranstaltungen anzeigen"
 
 #: project/templates/event/create.html:5
-#: project/templates/event/create.html:250 project/templates/layout.html:226
+#: project/templates/event/create.html:241 project/templates/layout.html:226
 #: project/templates/manage/events.html:27
 #: project/templates/manage/organizers.html:21
 msgid "Create event"
@@ -1549,8 +1540,8 @@ msgstr "Bearbeiten"
 
 #: project/templates/admin_unit/create.html:58
 #: project/templates/admin_unit/update.html:59
-#: project/templates/event/create.html:378
-#: project/templates/event/update.html:234
+#: project/templates/event/create.html:367
+#: project/templates/event/update.html:223
 #: project/templates/event_place/create.html:57
 #: project/templates/event_place/update.html:57
 #: project/templates/organizer/create.html:56
@@ -1694,40 +1685,45 @@ msgstr "Erstelle eine weitere Veranstaltung für %(admin_unit_name)s"
 msgid "List all events of %(admin_unit_name)s"
 msgstr "Zeige alle Veranstaltungen von %(admin_unit_name)s"
 
-#: project/templates/event/create.html:97
-#: project/templates/event/update.html:83
+#: project/templates/event/create.html:90
+#: project/templates/event/update.html:76
 #: project/templates/widget/event_suggestion/create.html:104
 msgid "Enter place or address"
 msgstr "Orte oder Adresse eingeben"
 
-#: project/templates/event/create.html:183
-#: project/templates/event/create.html:240
-#: project/templates/event/update.html:106
-#: project/templates/event/update.html:132
+#: project/templates/event/create.html:176
+#: project/templates/event/create.html:233
+#: project/templates/event/update.html:99
+#: project/templates/event/update.html:125
 #: project/templates/widget/event_suggestion/create.html:129
 msgid "Enter organizer"
 msgstr "Veranstalter eingeben"
 
+#: project/templates/event/create.html:260
+#: project/templates/event/update.html:151
+msgid "Event dates"
+msgstr "Termine"
+
 #: project/templates/event/create.html:267
 #: project/templates/event/update.html:158
-msgid "Event date"
-msgstr "Termin"
+msgid "Add event date"
+msgstr "Termin hinzufügen"
 
-#: project/templates/event/create.html:305
+#: project/templates/event/create.html:294
 msgid "Switch to organizer search"
 msgstr "Zur Veranstaltersuche wechseln"
 
-#: project/templates/event/create.html:340
+#: project/templates/event/create.html:329
 msgid "Switch to place search"
 msgstr "Zur Ortssuche wechseln"
 
-#: project/templates/event/create.html:351
-#: project/templates/event/update.html:207
+#: project/templates/event/create.html:340
+#: project/templates/event/update.html:196
 msgid "Access"
 msgstr "Zugang"
 
-#: project/templates/event/create.html:365
-#: project/templates/event/update.html:221
+#: project/templates/event/create.html:354
+#: project/templates/event/update.html:210
 msgid "Target group"
 msgstr "Zielgruppe"
 
@@ -1741,10 +1737,6 @@ msgstr "Veranstaltung \"%(name)s\" empfehlen"
 msgid "Request reference for event \"%(name)s\""
 msgstr "Empfehlung anfragen für Veranstaltung \"%(name)s\""
 
-#: project/templates/event_place/read.html:19
-msgid "Info"
-msgstr "Info"
-
 #: project/templates/event_suggestion/review.html:20
 #: project/templates/manage/reviews.html:19
 msgid "Review event suggestion"
@@ -1956,7 +1948,7 @@ msgstr "Du hast noch keinen Account? Kein Problem!"
 msgid "Widget"
 msgstr "Widget"
 
-#: project/templates/widget/event_date/list.html:124
+#: project/templates/widget/event_date/list.html:128
 msgid "Print"
 msgstr "Drucken"
 
@@ -2037,31 +2029,27 @@ msgstr "Die eingegebene Email passt nicht zur Email der Einladung"
 msgid "Invitation successfully deleted"
 msgstr "Einladung erfolgreich gelöscht"
 
-#: project/views/event.py:178
+#: project/views/event.py:177
 msgid "Event successfully published"
 msgstr "Veranstaltung erfolgreich veröffentlicht"
 
-#: project/views/event.py:180
+#: project/views/event.py:179
 msgid "Draft successfully saved"
 msgstr "Entwurf erfolgreich gespeichert"
 
-#: project/views/event.py:223
+#: project/views/event.py:222
 msgid "Event successfully updated"
 msgstr "Veranstaltung erfolgreich aktualisiert"
 
-#: project/views/event.py:246
-msgid "Entered name does not match event name"
-msgstr "Der eingegebene Name entspricht nicht dem Namen der Veranstaltung"
-
-#: project/views/event.py:252
+#: project/views/event.py:248
 msgid "Event successfully deleted"
 msgstr "Veranstaltung erfolgreich gelöscht"
 
-#: project/views/event.py:404
+#: project/views/event.py:403
 msgid "Referenced event changed"
 msgstr "Empfohlene Veranstaltung wurde geändert"
 
-#: project/views/event.py:427
+#: project/views/event.py:426
 msgid "New event report"
 msgstr "Neue Meldung zu einer Veranstaltung"
 
@@ -2217,11 +2205,13 @@ msgstr "Anzeigen"
 msgid "You do not have permission for this action"
 msgstr "Du hast keine Berechtigung für diese Aktion"
 
-#: project/views/utils.py:264
+#: project/views/utils.py:258
 msgid ""
 "The invitation was issued to another user. Sign in with the email address"
 " the invitation was sent to."
-msgstr "Die Einladung wurde für einen anderen Nutzer ausgestellt. Melde dich mit der Email-Adresse an, an die die Einladung geschickt wurde."
+msgstr ""
+"Die Einladung wurde für einen anderen Nutzer ausgestellt. Melde dich mit "
+"der Email-Adresse an, an die die Einladung geschickt wurde."
 
 #: project/views/widget.py:150
 msgid "Thank you so much! The event is being verified."
@@ -2276,3 +2266,30 @@ msgstr "Neue Veranstaltung zu prüfen"
 #~ msgid "Example"
 #~ msgstr "Beispiel"
 
+#~ msgid "Indicate when the event will take place."
+#~ msgstr "Gib an, wann die Veranstaltung stattfindet."
+
+#~ msgid ""
+#~ "Indicate when the event will end. "
+#~ "An event can last a maximum of "
+#~ "14 days."
+#~ msgstr ""
+#~ "Gib an, wann die Veranstaltung endet."
+#~ " Eine Veranstaltung darf maximal 14 "
+#~ "Tage dauern."
+
+#~ msgid "Host"
+#~ msgstr "Veranstalter"
+
+#~ msgid "Show all events"
+#~ msgstr "Alle Veranstaltungen anzeigen"
+
+#~ msgid "Event date"
+#~ msgstr "Termin"
+
+#~ msgid "Info"
+#~ msgstr "Info"
+
+#~ msgid "Entered name does not match event name"
+#~ msgstr "Der eingegebene Name entspricht nicht dem Namen der Veranstaltung"
+
diff --git a/project/translations/en/LC_MESSAGES/messages.mo b/project/translations/en/LC_MESSAGES/messages.mo
index ececdf0..449fd59 100644
Binary files a/project/translations/en/LC_MESSAGES/messages.mo and b/project/translations/en/LC_MESSAGES/messages.mo differ
diff --git a/project/translations/en/LC_MESSAGES/messages.po b/project/translations/en/LC_MESSAGES/messages.po
index 151fc8f..9c21a48 100644
--- a/project/translations/en/LC_MESSAGES/messages.po
+++ b/project/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-11-04 16:04+0100\n"
+"POT-Creation-Date: 2021-11-14 16:26+0100\n"
 "PO-Revision-Date: 2021-04-30 15:04+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Legal notice"
 msgstr ""
 
-#: project/forms/admin.py:12 project/templates/_macros.html:1412
+#: project/forms/admin.py:12 project/templates/_macros.html:1383
 #: project/templates/layout.html:317
 #: project/templates/widget/event_suggestion/create.html:204
 #: project/views/admin_unit.py:73 project/views/root.py:53
@@ -308,12 +308,11 @@ msgstr ""
 msgid "Longitude"
 msgstr ""
 
-#: project/forms/admin_unit.py:29 project/forms/event.py:36
-#: project/forms/event.py:65 project/forms/event.py:398
-#: project/forms/event_place.py:25 project/forms/event_place.py:50
-#: project/forms/event_suggestion.py:26 project/forms/oauth2_client.py:66
-#: project/forms/organizer.py:25 project/forms/organizer.py:52
-#: project/forms/reference_request.py:23 project/templates/_macros.html:135
+#: project/forms/admin_unit.py:29 project/forms/event.py:85
+#: project/forms/event.py:114 project/forms/event_place.py:25
+#: project/forms/event_place.py:50 project/forms/event_suggestion.py:26
+#: project/forms/oauth2_client.py:66 project/forms/organizer.py:25
+#: project/forms/organizer.py:52 project/forms/reference_request.py:23
 #: project/templates/admin/admin_units.html:19
 #: project/templates/event_place/list.html:19
 #: project/templates/oauth2_client/list.html:25
@@ -328,32 +327,32 @@ msgstr ""
 msgid "The short name is used to create a unique identifier for your events"
 msgstr ""
 
-#: project/forms/admin_unit.py:41 project/templates/_macros.html:1548
+#: project/forms/admin_unit.py:41 project/templates/_macros.html:1519
 msgid "Short name must contain only letters numbers or underscore"
 msgstr ""
 
-#: project/forms/admin_unit.py:47 project/forms/event.py:57
-#: project/forms/event.py:95 project/forms/event_place.py:26
+#: project/forms/admin_unit.py:47 project/forms/event.py:106
+#: project/forms/event.py:124 project/forms/event_place.py:26
 #: project/forms/organizer.py:26
 msgid "Link URL"
 msgstr ""
 
 #: project/forms/admin_unit.py:48 project/forms/admin_unit_member.py:11
 #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
-#: project/forms/event.py:58 project/forms/event_suggestion.py:38
-#: project/forms/organizer.py:27 project/templates/_macros.html:262
-#: project/templates/_macros.html:1508 project/templates/admin/users.html:19
+#: project/forms/event.py:107 project/forms/event_suggestion.py:38
+#: project/forms/organizer.py:27 project/templates/_macros.html:226
+#: project/templates/_macros.html:1479 project/templates/admin/users.html:19
 msgid "Email"
 msgstr ""
 
-#: project/forms/admin_unit.py:49 project/forms/event.py:59
+#: project/forms/admin_unit.py:49 project/forms/event.py:108
 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28
-#: project/templates/_macros.html:315
+#: project/templates/_macros.html:279
 msgid "Phone"
 msgstr ""
 
-#: project/forms/admin_unit.py:50 project/forms/event.py:60
-#: project/forms/organizer.py:29 project/templates/_macros.html:323
+#: project/forms/admin_unit.py:50 project/forms/event.py:109
+#: project/forms/organizer.py:29 project/templates/_macros.html:287
 msgid "Fax"
 msgstr ""
 
@@ -440,467 +439,468 @@ msgstr ""
 msgid "Image"
 msgstr ""
 
-#: project/forms/common.py:72
+#: project/forms/common.py:71
 #, python-format
 msgid ""
 "I read and accept %(tos_open)sTerms of Service%(tos_close)s and "
 "%(privacy_open)sPrivacy%(privacy_close)s."
 msgstr ""
 
-#: project/forms/common.py:83
+#: project/forms/common.py:82
 msgid "0 (Little relevant)"
 msgstr ""
 
-#: project/forms/common.py:88
+#: project/forms/common.py:87
 msgid "5 (Default)"
 msgstr ""
 
-#: project/forms/common.py:93
+#: project/forms/common.py:92
 msgid "10 (Highlight)"
 msgstr ""
 
-#: project/forms/common.py:97
+#: project/forms/common.py:96
 msgid "Monday"
 msgstr ""
 
-#: project/forms/common.py:98
+#: project/forms/common.py:97
 msgid "Tueday"
 msgstr ""
 
-#: project/forms/common.py:99
+#: project/forms/common.py:98
 msgid "Wednesday"
 msgstr ""
 
-#: project/forms/common.py:100
+#: project/forms/common.py:99
 msgid "Thursday"
 msgstr ""
 
-#: project/forms/common.py:101
+#: project/forms/common.py:100
 msgid "Friday"
 msgstr ""
 
-#: project/forms/common.py:102
+#: project/forms/common.py:101
 msgid "Saturday"
 msgstr ""
 
-#: project/forms/common.py:103
+#: project/forms/common.py:102
 msgid "Sunday"
 msgstr ""
 
-#: project/forms/common.py:107
+#: project/forms/common.py:106
 msgid "500 m"
 msgstr ""
 
-#: project/forms/common.py:108
+#: project/forms/common.py:107
 msgid "5 km"
 msgstr ""
 
-#: project/forms/common.py:109
+#: project/forms/common.py:108
 msgid "10 km"
 msgstr ""
 
-#: project/forms/common.py:110
+#: project/forms/common.py:109
 msgid "20 km"
 msgstr ""
 
-#: project/forms/common.py:111
+#: project/forms/common.py:110
 msgid "50 km"
 msgstr ""
 
-#: project/forms/common.py:112
+#: project/forms/common.py:111
 msgid "100 km"
 msgstr ""
 
-#: project/forms/event.py:54
-msgid "Organizator"
-msgstr ""
-
-#: project/forms/event.py:67
-msgid "Enter a short, meaningful name for the event."
-msgstr ""
-
-#: project/forms/event.py:70
+#: project/forms/event.py:38
 msgid "Start"
 msgstr ""
 
-#: project/forms/event.py:72
-msgid "Indicate when the event will take place."
+#: project/forms/event.py:40
+msgid "Indicate when the event date will start."
 msgstr ""
 
-#: project/forms/event.py:75
+#: project/forms/event.py:43
 msgid "End"
 msgstr ""
 
-#: project/forms/event.py:77
-msgid "Indicate when the event will end. An event can last a maximum of 14 days."
+#: project/forms/event.py:45
+msgid ""
+"Indicate when the event date will end. An event can last a maximum of 14 "
+"days."
 msgstr ""
 
-#: project/forms/event.py:82 project/templates/planing/list.html:75
+#: project/forms/event.py:50 project/templates/planing/list.html:75
 msgid "All-day"
 msgstr ""
 
-#: project/forms/event.py:86 project/templates/event/create.html:274
-#: project/templates/event/update.html:165
+#: project/forms/event.py:54 project/templates/_macros.html:1699
 #: project/templates/widget/event_suggestion/create.html:240
 msgid "Recurring event"
 msgstr ""
 
-#: project/forms/event.py:90 project/forms/event_place.py:28
+#: project/forms/event.py:61 project/templates/_macros.html:1240
+msgid "The start must be before the end."
+msgstr ""
+
+#: project/forms/event.py:67 project/templates/_macros.html:1257
+msgid "An event can last a maximum of 14 days."
+msgstr ""
+
+#: project/forms/event.py:103
+msgid "Organizator"
+msgstr ""
+
+#: project/forms/event.py:116
+msgid "Enter a short, meaningful name for the event."
+msgstr ""
+
+#: project/forms/event.py:119 project/forms/event_place.py:28
 msgid "Description"
 msgstr ""
 
-#: project/forms/event.py:92
+#: project/forms/event.py:121
 msgid "Add an description of the event."
 msgstr ""
 
-#: project/forms/event.py:97
+#: project/forms/event.py:126
 msgid ""
 "Enter a link to an external website containing more information about the"
 " event."
 msgstr ""
 
-#: project/forms/event.py:102
+#: project/forms/event.py:131
 msgid "Ticket Link URL"
 msgstr ""
 
-#: project/forms/event.py:104
+#: project/forms/event.py:133
 msgid "Enter a link where tickets can be purchased."
 msgstr ""
 
-#: project/forms/event.py:107 project/templates/_macros.html:244
+#: project/forms/event.py:136 project/templates/_macros.html:208
 msgid "Tags"
 msgstr ""
 
-#: project/forms/event.py:109
+#: project/forms/event.py:138
 msgid ""
 "Enter keywords with which the event should be found. Words do not need to"
 " be entered if they are already in the name or description."
 msgstr ""
 
-#: project/forms/event.py:114
+#: project/forms/event.py:143
 msgid "Kid friendly"
 msgstr ""
 
-#: project/forms/event.py:116
+#: project/forms/event.py:145
 msgid "If the event is particularly suitable for children."
 msgstr ""
 
-#: project/forms/event.py:119
+#: project/forms/event.py:148
 msgid "Accessible for free"
 msgstr ""
 
-#: project/forms/event.py:121
+#: project/forms/event.py:150
 msgid "If the event is accessible for free."
 msgstr ""
 
-#: project/forms/event.py:124
+#: project/forms/event.py:153
 msgid "Typical Age from"
 msgstr ""
 
-#: project/forms/event.py:126
+#: project/forms/event.py:155
 msgid "The minimum age that participants should be."
 msgstr ""
 
-#: project/forms/event.py:129
+#: project/forms/event.py:158
 msgid "Typical Age to"
 msgstr ""
 
-#: project/forms/event.py:131
+#: project/forms/event.py:160
 msgid "The maximum age that participants should be."
 msgstr ""
 
-#: project/forms/event.py:134
+#: project/forms/event.py:163
 msgid "Registration required"
 msgstr ""
 
-#: project/forms/event.py:136
+#: project/forms/event.py:165
 msgid "If the participants needs to register for the event."
 msgstr ""
 
-#: project/forms/event.py:141 project/templates/_macros.html:276
+#: project/forms/event.py:170 project/templates/_macros.html:240
 #: project/templates/layout.html:128
 msgid "Booked up"
 msgstr ""
 
-#: project/forms/event.py:143
+#: project/forms/event.py:172
 msgid "If the event is booked up or sold out."
 msgstr ""
 
-#: project/forms/event.py:146
+#: project/forms/event.py:175
 msgid "Expected number of participants"
 msgstr ""
 
-#: project/forms/event.py:148
+#: project/forms/event.py:177
 msgid "The estimated expected attendance."
 msgstr ""
 
-#: project/forms/event.py:151
+#: project/forms/event.py:180
 msgid "Price info"
 msgstr ""
 
-#: project/forms/event.py:153
+#: project/forms/event.py:182
 msgid ""
 "Enter price information in textual form. E.g., different prices for "
 "adults and children."
 msgstr ""
 
-#: project/forms/event.py:158
+#: project/forms/event.py:187
 msgid "Target group origin"
 msgstr "Suitable for tourists / residents"
 
-#: project/forms/event.py:163
+#: project/forms/event.py:192
 msgid "EventTargetGroupOrigin.both"
 msgstr "For tourists and residents"
 
-#: project/forms/event.py:167
+#: project/forms/event.py:196
 msgid "EventTargetGroupOrigin.tourist"
 msgstr "Mainly for tourists"
 
-#: project/forms/event.py:171
+#: project/forms/event.py:200
 msgid "EventTargetGroupOrigin.resident"
 msgstr "Mainly for residents"
 
-#: project/forms/event.py:174
+#: project/forms/event.py:203
 msgid ""
 "Choose whether the event is particularly suitable for tourists or "
 "residents."
 msgstr ""
 
-#: project/forms/event.py:179
+#: project/forms/event.py:208
 msgid "Attendance mode"
 msgstr ""
 
-#: project/forms/event.py:184
+#: project/forms/event.py:213
 msgid "EventAttendanceMode.offline"
 msgstr "Normal (Offline)"
 
-#: project/forms/event.py:188 project/templates/layout.html:116
+#: project/forms/event.py:217 project/templates/layout.html:116
 msgid "EventAttendanceMode.online"
 msgstr "Online"
 
-#: project/forms/event.py:190 project/templates/layout.html:119
+#: project/forms/event.py:219 project/templates/layout.html:119
 msgid "EventAttendanceMode.mixed"
 msgstr "Online and offline"
 
-#: project/forms/event.py:192
+#: project/forms/event.py:221
 msgid "Choose how people can attend the event."
 msgstr ""
 
-#: project/forms/event.py:196 project/forms/event_place.py:27
+#: project/forms/event.py:225 project/forms/event_place.py:27
 #: project/templates/widget/event_suggestion/create.html:258
 msgid "Photo"
 msgstr ""
 
-#: project/forms/event.py:198
+#: project/forms/event.py:227
 msgid ""
 "We recommend uploading a photo for the event. It looks a lot more, but of"
 " course it works without it."
 msgstr ""
 
-#: project/forms/event.py:208 project/templates/_macros.html:1269
-msgid "The start must be before the end."
-msgstr ""
-
-#: project/forms/event.py:214 project/templates/_macros.html:1286
-msgid "An event can last a maximum of 14 days."
-msgstr ""
-
-#: project/forms/event.py:222 project/templates/_macros.html:423
-#: project/templates/_macros.html:586
+#: project/forms/event.py:242 project/templates/_macros.html:387
+#: project/templates/_macros.html:550
 msgid "Previous start date"
 msgstr ""
 
-#: project/forms/event.py:224
+#: project/forms/event.py:244
 msgid "Enter when the event should have taken place before it was postponed."
 msgstr ""
 
-#: project/forms/event.py:229 project/forms/event_suggestion.py:71
+#: project/forms/event.py:249 project/forms/event_suggestion.py:71
 msgid "Categories"
 msgstr ""
 
-#: project/forms/event.py:232 project/forms/event_suggestion.py:74
+#: project/forms/event.py:252 project/forms/event_suggestion.py:74
 msgid "Choose categories that fit the event."
 msgstr ""
 
-#: project/forms/event.py:235 project/forms/reference.py:14
+#: project/forms/event.py:255 project/forms/reference.py:14
 #: project/forms/reference.py:27 project/forms/reference_request.py:76
-#: project/templates/event/create.html:390
-#: project/templates/event/update.html:246
+#: project/templates/event/create.html:379
+#: project/templates/event/update.html:235
 msgid "Rating"
 msgstr ""
 
-#: project/forms/event.py:239 project/forms/reference.py:18
+#: project/forms/event.py:259 project/forms/reference.py:18
 #: project/forms/reference.py:31 project/forms/reference_request.py:80
 msgid ""
 "Choose how relevant the event is to your organization. The value is not "
 "visible and is used for sorting."
 msgstr ""
 
-#: project/forms/event.py:244
+#: project/forms/event.py:264
 msgid "Co-organizers"
 msgstr ""
 
-#: project/forms/event.py:247
+#: project/forms/event.py:267
 msgid ""
 "Select optional co-organizers. You can add and modify organizers at "
 "Organization > Organizers."
 msgstr ""
 
-#: project/forms/event.py:257
+#: project/forms/event.py:277
 msgid "Invalid co-organizer."
 msgstr ""
 
-#: project/forms/event.py:266 project/forms/event.py:275
-#: project/forms/event.py:344 project/forms/event_suggestion.py:50
-#: project/templates/_macros.html:463 project/templates/_macros.html:623
-#: project/templates/event/create.html:315
-#: project/templates/event/update.html:196
+#: project/forms/event.py:286 project/forms/event.py:295
+#: project/forms/event.py:368 project/forms/event_suggestion.py:50
+#: project/templates/_macros.html:427 project/templates/_macros.html:587
+#: project/templates/event/create.html:304
+#: project/templates/event/update.html:185
 #: project/templates/event_place/create.html:31
 #: project/templates/event_place/delete.html:13
 #: project/templates/event_place/update.html:31
 msgid "Place"
 msgstr ""
 
-#: project/forms/event.py:268
+#: project/forms/event.py:288
 msgid "Select existing place"
 msgstr ""
 
-#: project/forms/event.py:269
+#: project/forms/event.py:289
 msgid "Enter new place"
 msgstr ""
 
-#: project/forms/event.py:282 project/forms/event.py:291
-#: project/forms/event.py:352 project/forms/event.py:414
-#: project/forms/event_suggestion.py:60 project/templates/_macros.html:500
-#: project/templates/_macros.html:660 project/templates/event/create.html:284
-#: project/templates/event/update.html:186
+#: project/forms/event.py:302 project/forms/event.py:311
+#: project/forms/event.py:376 project/forms/event.py:439
+#: project/forms/event_suggestion.py:60 project/templates/_macros.html:464
+#: project/templates/_macros.html:624 project/templates/event/create.html:273
+#: project/templates/event/update.html:175
 #: project/templates/organizer/create.html:27
 #: project/templates/organizer/delete.html:13
 #: project/templates/organizer/update.html:27
 msgid "Organizer"
 msgstr ""
 
-#: project/forms/event.py:284
+#: project/forms/event.py:304
 msgid "Select existing organizer"
 msgstr ""
 
-#: project/forms/event.py:285
+#: project/forms/event.py:305
 msgid "Enter new organizer"
 msgstr ""
 
-#: project/forms/event.py:297
+#: project/forms/event.py:317
 msgid "Save as draft"
 msgstr ""
 
-#: project/forms/event.py:298
+#: project/forms/event.py:318
 msgid "Publish event"
 msgstr ""
 
-#: project/forms/event.py:328
+#: project/forms/event.py:350
 msgid "Select existing place or enter new place"
 msgstr ""
 
-#: project/forms/event.py:335
+#: project/forms/event.py:358
 msgid "Select existing organizer or enter new organizer"
 msgstr ""
 
-#: project/forms/event.py:347
+#: project/forms/event.py:371
 msgid ""
 "Choose where the event takes place. You can add and modify places at "
 "Organization > Places."
 msgstr ""
 
-#: project/forms/event.py:355
+#: project/forms/event.py:379
 msgid ""
 "Select the organizer. You can add and modify organizers at Organization >"
 " Organizers."
 msgstr ""
 
-#: project/forms/event.py:361 project/templates/event/update.html:175
+#: project/forms/event.py:385 project/templates/event/update.html:164
 #: project/templates/oauth2_token/list.html:21
 msgid "Status"
 msgstr ""
 
-#: project/forms/event.py:364
+#: project/forms/event.py:388
 msgid "EventStatus.scheduled"
 msgstr "Scheduled"
 
-#: project/forms/event.py:365 project/templates/layout.html:82
+#: project/forms/event.py:389 project/templates/layout.html:82
 #: project/templates/layout.html:97
 msgid "EventStatus.cancelled"
 msgstr "Cancelled"
 
-#: project/forms/event.py:366 project/templates/layout.html:85
+#: project/forms/event.py:390 project/templates/layout.html:85
 #: project/templates/layout.html:100
 msgid "EventStatus.movedOnline"
 msgstr "Moved online"
 
-#: project/forms/event.py:367 project/templates/layout.html:88
+#: project/forms/event.py:391 project/templates/layout.html:88
 #: project/templates/layout.html:103
 msgid "EventStatus.postponed"
 msgstr "Postponed"
 
-#: project/forms/event.py:368 project/templates/layout.html:91
+#: project/forms/event.py:392 project/templates/layout.html:91
 #: project/templates/layout.html:106
 msgid "EventStatus.rescheduled"
 msgstr "Rescheduled"
 
-#: project/forms/event.py:370
+#: project/forms/event.py:394
 msgid "Select the status of the event."
 msgstr ""
 
-#: project/forms/event.py:374
+#: project/forms/event.py:398
 msgid "Public status"
 msgstr ""
 
-#: project/forms/event.py:377
+#: project/forms/event.py:401
 msgid "PublicStatus.published"
 msgstr ""
 
-#: project/forms/event.py:378 project/templates/_macros.html:282
+#: project/forms/event.py:402 project/templates/_macros.html:246
 msgid "PublicStatus.draft"
 msgstr ""
 
-#: project/forms/event.py:380
+#: project/forms/event.py:404
 msgid "Select the public status of the event."
 msgstr ""
 
-#: project/forms/event.py:383 project/templates/event/update.html:5
-#: project/templates/event/update.html:141
+#: project/forms/event.py:407 project/templates/event/update.html:5
+#: project/templates/event/update.html:132
 msgid "Update event"
 msgstr ""
 
-#: project/forms/event.py:397 project/templates/_macros.html:1241
+#: project/forms/event.py:423 project/templates/_macros.html:1212
 #: project/templates/event/actions.html:47
 #: project/templates/event/delete.html:6
 msgid "Delete event"
 msgstr ""
 
-#: project/forms/event.py:405 project/forms/event_date.py:15
+#: project/forms/event.py:430 project/forms/event_date.py:15
 #: project/forms/planing.py:14
 msgid "From"
 msgstr ""
 
-#: project/forms/event.py:407 project/forms/event_date.py:17
+#: project/forms/event.py:432 project/forms/event_date.py:17
 #: project/forms/planing.py:16
 msgid "to"
 msgstr ""
 
-#: project/forms/event.py:409 project/forms/event_date.py:19
+#: project/forms/event.py:434 project/forms/event_date.py:19
 msgid "Keyword"
 msgstr ""
 
-#: project/forms/event.py:411 project/forms/event_date.py:21
-#: project/forms/planing.py:19 project/templates/_macros.html:396
+#: project/forms/event.py:436 project/forms/event_date.py:21
+#: project/forms/planing.py:19 project/templates/_macros.html:360
 msgid "Category"
 msgstr ""
 
-#: project/forms/event.py:417
+#: project/forms/event.py:442
 msgid "Find events"
 msgstr ""
 
 #: project/forms/event_date.py:24 project/forms/planing.py:22
-#: project/templates/_macros.html:137 project/templates/_macros.html:330
+#: project/templates/_macros.html:294
 #: project/templates/admin_unit/create.html:38
 #: project/templates/admin_unit/update.html:39
 #: project/templates/event_place/create.html:40
@@ -926,8 +926,7 @@ msgstr ""
 msgid "Create place"
 msgstr ""
 
-#: project/forms/event_place.py:45 project/templates/event_place/read.html:12
-#: project/templates/event_place/update.html:5
+#: project/forms/event_place.py:45 project/templates/event_place/update.html:5
 #: project/templates/event_place/update.html:21
 msgid "Update place"
 msgstr ""
@@ -956,13 +955,13 @@ msgstr ""
 msgid "I would like to be notified by email after the review"
 msgstr ""
 
-#: project/forms/event_suggestion.py:52 project/templates/event/create.html:320
+#: project/forms/event_suggestion.py:52 project/templates/event/create.html:309
 msgid ""
 "Choose where the event takes place. If the venue is not yet in the list, "
 "just enter it."
 msgstr ""
 
-#: project/forms/event_suggestion.py:62 project/templates/event/create.html:288
+#: project/forms/event_suggestion.py:62 project/templates/event/create.html:277
 msgid ""
 "Select the organizer. If the organizer is not yet on the list, just enter"
 " it."
@@ -974,27 +973,27 @@ msgstr ""
 msgid "Create event suggestion"
 msgstr ""
 
-#: project/forms/event_suggestion.py:116 project/forms/reference_request.py:48
+#: project/forms/event_suggestion.py:124 project/forms/reference_request.py:48
 msgid "Rejection reason"
 msgstr ""
 
-#: project/forms/event_suggestion.py:121
+#: project/forms/event_suggestion.py:129
 msgid "EventRejectionReason.noreason"
 msgstr ""
 
-#: project/forms/event_suggestion.py:125
+#: project/forms/event_suggestion.py:133
 msgid "EventRejectionReason.duplicate"
 msgstr "Duplicate"
 
-#: project/forms/event_suggestion.py:129
+#: project/forms/event_suggestion.py:137
 msgid "EventRejectionReason.untrustworthy"
 msgstr "Untrustworthy"
 
-#: project/forms/event_suggestion.py:133
+#: project/forms/event_suggestion.py:141
 msgid "EventRejectionReason.illegal"
 msgstr "Illegal"
 
-#: project/forms/event_suggestion.py:138
+#: project/forms/event_suggestion.py:146
 #: project/templates/event_suggestion/reject.html:9
 #: project/templates/event_suggestion/review.html:33
 #: project/templates/event_suggestion/review.html:40
@@ -1044,7 +1043,7 @@ msgid "Weekdays"
 msgstr ""
 
 #: project/forms/reference.py:11 project/forms/reference_request.py:16
-#: project/templates/_macros.html:516 project/templates/_macros.html:676
+#: project/templates/_macros.html:480 project/templates/_macros.html:640
 #: project/templates/admin_unit/create.html:28
 #: project/templates/admin_unit/update.html:29
 #: project/templates/layout.html:258
@@ -1072,7 +1071,7 @@ msgstr ""
 msgid "Delete request"
 msgstr ""
 
-#: project/forms/reference_request.py:28 project/templates/_macros.html:1424
+#: project/forms/reference_request.py:28 project/templates/_macros.html:1395
 #: project/templates/event_suggestion/review_status.html:18
 #: project/templates/reference_request/review_status.html:12
 msgid "Review status"
@@ -1134,108 +1133,98 @@ msgstr ""
 msgid "This field is required."
 msgstr ""
 
-#: project/templates/_macros.html:134 project/templates/_macros.html:418
-#: project/templates/_macros.html:937
-msgid "Date"
-msgstr ""
-
-#: project/templates/_macros.html:136
-msgid "Host"
-msgstr ""
-
-#: project/templates/_macros.html:158
-msgid "Show all events"
-msgstr ""
-
-#: project/templates/_macros.html:174
+#: project/templates/_macros.html:138
 msgid "Show on Google Maps"
 msgstr ""
 
-#: project/templates/_macros.html:253
+#: project/templates/_macros.html:217
 msgid "Link"
 msgstr ""
 
-#: project/templates/_macros.html:309
+#: project/templates/_macros.html:273
 msgid "Verified"
 msgstr ""
 
-#: project/templates/_macros.html:373
+#: project/templates/_macros.html:337
 #, python-format
 msgid "Created at %(created_at)s by %(created_by)s."
 msgstr ""
 
-#: project/templates/_macros.html:375
+#: project/templates/_macros.html:339
 #, python-format
 msgid "Created at %(created_at)s."
 msgstr ""
 
-#: project/templates/_macros.html:380
+#: project/templates/_macros.html:344
 #, python-format
 msgid "Last updated at %(updated_at)s by %(updated_by)s."
 msgstr ""
 
-#: project/templates/_macros.html:382
+#: project/templates/_macros.html:346
 #, python-format
 msgid "Last updated at %(updated_at)s."
 msgstr ""
 
-#: project/templates/_macros.html:412 project/templates/_macros.html:582
+#: project/templates/_macros.html:376 project/templates/_macros.html:546
 #: project/templates/event/actions.html:12
-#: project/templates/event/create.html:257
-#: project/templates/event/delete.html:13
-#: project/templates/event/update.html:148
+#: project/templates/event/create.html:250
+#: project/templates/event/update.html:141
 #: project/templates/widget/event_suggestion/create.html:229
 msgid "Event"
 msgstr ""
 
-#: project/templates/_macros.html:445 project/templates/_macros.html:604
-#: project/templates/_macros.html:1493 project/templates/event/actions.html:32
+#: project/templates/_macros.html:382 project/templates/_macros.html:908
+msgid "Date"
+msgstr ""
+
+#: project/templates/_macros.html:409 project/templates/_macros.html:568
+#: project/templates/_macros.html:1464 project/templates/event/actions.html:32
 msgid "Share"
 msgstr ""
 
-#: project/templates/_macros.html:449 project/templates/_macros.html:608
-#: project/templates/_macros.html:1523
+#: project/templates/_macros.html:413 project/templates/_macros.html:572
+#: project/templates/_macros.html:1494
 msgid "Add to calendar"
 msgstr ""
 
-#: project/templates/_macros.html:457 project/templates/_macros.html:616
+#: project/templates/_macros.html:421 project/templates/_macros.html:580
 #: project/templates/event/report.html:4
 msgid "Report event"
 msgstr ""
 
-#: project/templates/_macros.html:484 project/templates/_macros.html:642
+#: project/templates/_macros.html:448 project/templates/_macros.html:606
 msgid "Show directions"
 msgstr ""
 
-#: project/templates/_macros.html:489 project/templates/_macros.html:647
+#: project/templates/_macros.html:453 project/templates/_macros.html:611
 msgid "The event takes place online."
 msgstr ""
 
-#: project/templates/_macros.html:491 project/templates/_macros.html:649
+#: project/templates/_macros.html:455 project/templates/_macros.html:613
 msgid "The event takes place both offline and online."
 msgstr ""
 
-#: project/templates/_macros.html:703 project/templates/event_date/list.html:5
+#: project/templates/_macros.html:667 project/templates/event_date/list.html:5
 #: project/templates/event_date/list.html:300
 #: project/templates/reference_request/review.html:32
 msgid "Event Dates"
 msgstr ""
 
-#: project/templates/_macros.html:795
+#: project/templates/_macros.html:759
 msgid "Search location on Google"
 msgstr ""
 
-#: project/templates/_macros.html:861
+#: project/templates/_macros.html:825
 #, python-format
 msgid "%(count)d event dates"
 msgstr ""
 
-#: project/templates/_macros.html:877 project/templates/_macros.html:879
+#: project/templates/_macros.html:848 project/templates/_macros.html:850
 #: project/templates/event_date/list.html:321
 msgid "First"
 msgstr ""
 
-#: project/templates/_macros.html:882 project/templates/_macros.html:884
+#: project/templates/_macros.html:853 project/templates/_macros.html:855
 #: project/templates/event_date/list.html:322
 #: project/templates/widget/event_suggestion/create.html:193
 #: project/templates/widget/event_suggestion/create.html:218
@@ -1246,12 +1235,12 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: project/templates/_macros.html:886
+#: project/templates/_macros.html:857
 #, python-format
 msgid "Page %(page)d of %(pages)d (%(total)d total)"
 msgstr ""
 
-#: project/templates/_macros.html:888 project/templates/_macros.html:890
+#: project/templates/_macros.html:859 project/templates/_macros.html:861
 #: project/templates/event_date/list.html:324
 #: project/templates/widget/event_suggestion/create.html:194
 #: project/templates/widget/event_suggestion/create.html:219
@@ -1261,76 +1250,80 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: project/templates/_macros.html:893 project/templates/_macros.html:895
+#: project/templates/_macros.html:864 project/templates/_macros.html:866
 #: project/templates/event_date/list.html:325
 msgid "Last"
 msgstr ""
 
-#: project/templates/_macros.html:960
+#: project/templates/_macros.html:931
 msgid "Radius"
 msgstr ""
 
-#: project/templates/_macros.html:1170
+#: project/templates/_macros.html:1141
 msgid "Edit image"
 msgstr ""
 
-#: project/templates/_macros.html:1191
+#: project/templates/_macros.html:1162
 msgid "Close"
 msgstr ""
 
-#: project/templates/_macros.html:1192
+#: project/templates/_macros.html:1163
 msgid "Okay"
 msgstr ""
 
-#: project/templates/_macros.html:1204
+#: project/templates/_macros.html:1175
 msgid "Choose image file"
 msgstr ""
 
-#: project/templates/_macros.html:1240 project/templates/event/actions.html:46
+#: project/templates/_macros.html:1211 project/templates/event/actions.html:46
 msgid "Edit event"
 msgstr ""
 
-#: project/templates/_macros.html:1243 project/templates/manage/events.html:45
+#: project/templates/_macros.html:1214 project/templates/manage/events.html:45
 msgid "More"
 msgstr ""
 
-#: project/templates/_macros.html:1290
+#: project/templates/_macros.html:1261
 msgid "Please enter a valid time, between 00:00 and 23:59."
 msgstr ""
 
-#: project/templates/_macros.html:1318
+#: project/templates/_macros.html:1289
 #, python-format
 msgid "Just use %(term)s"
 msgstr ""
 
-#: project/templates/_macros.html:1384
+#: project/templates/_macros.html:1355
 msgid "Event suggestion"
 msgstr ""
 
-#: project/templates/_macros.html:1502
+#: project/templates/_macros.html:1473
 msgid "Link copied"
 msgstr ""
 
-#: project/templates/_macros.html:1502
+#: project/templates/_macros.html:1473
 msgid "Copy link"
 msgstr ""
 
-#: project/templates/_macros.html:1531
+#: project/templates/_macros.html:1502
 msgid "Google calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1532
+#: project/templates/_macros.html:1503
 msgid "Apple calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1533
+#: project/templates/_macros.html:1504
 msgid "Yahoo calendar"
 msgstr ""
 
-#: project/templates/_macros.html:1534
+#: project/templates/_macros.html:1505
 msgid "Other calendar"
 msgstr ""
 
+#: project/templates/_macros.html:1700
+msgid "Remove event date"
+msgstr ""
+
 #: project/templates/home.html:28
 msgid "Manage"
 msgstr ""
@@ -1340,8 +1333,8 @@ msgstr ""
 msgid "Register for free"
 msgstr ""
 
-#: project/templates/event_place/read.html:22 project/templates/layout.html:175
-#: project/templates/layout.html:219 project/templates/manage/events.html:6
+#: project/templates/layout.html:175 project/templates/layout.html:219
+#: project/templates/manage/events.html:6
 #: project/templates/manage/events.html:24
 msgid "Events"
 msgstr ""
@@ -1383,7 +1376,7 @@ msgid "Show events"
 msgstr ""
 
 #: project/templates/event/create.html:5
-#: project/templates/event/create.html:250 project/templates/layout.html:226
+#: project/templates/event/create.html:241 project/templates/layout.html:226
 #: project/templates/manage/events.html:27
 #: project/templates/manage/organizers.html:21
 msgid "Create event"
@@ -1502,8 +1495,8 @@ msgstr ""
 
 #: project/templates/admin_unit/create.html:58
 #: project/templates/admin_unit/update.html:59
-#: project/templates/event/create.html:378
-#: project/templates/event/update.html:234
+#: project/templates/event/create.html:367
+#: project/templates/event/update.html:223
 #: project/templates/event_place/create.html:57
 #: project/templates/event_place/update.html:57
 #: project/templates/organizer/create.html:56
@@ -1643,40 +1636,45 @@ msgstr ""
 msgid "List all events of %(admin_unit_name)s"
 msgstr ""
 
-#: project/templates/event/create.html:97
-#: project/templates/event/update.html:83
+#: project/templates/event/create.html:90
+#: project/templates/event/update.html:76
 #: project/templates/widget/event_suggestion/create.html:104
 msgid "Enter place or address"
 msgstr ""
 
-#: project/templates/event/create.html:183
-#: project/templates/event/create.html:240
-#: project/templates/event/update.html:106
-#: project/templates/event/update.html:132
+#: project/templates/event/create.html:176
+#: project/templates/event/create.html:233
+#: project/templates/event/update.html:99
+#: project/templates/event/update.html:125
 #: project/templates/widget/event_suggestion/create.html:129
 msgid "Enter organizer"
 msgstr ""
 
-#: project/templates/event/create.html:267
-#: project/templates/event/update.html:158
-msgid "Event date"
+#: project/templates/event/create.html:260
+#: project/templates/event/update.html:151
+msgid "Event dates"
 msgstr ""
 
-#: project/templates/event/create.html:305
+#: project/templates/event/create.html:267
+#: project/templates/event/update.html:158
+msgid "Add event date"
+msgstr ""
+
+#: project/templates/event/create.html:294
 msgid "Switch to organizer search"
 msgstr ""
 
-#: project/templates/event/create.html:340
+#: project/templates/event/create.html:329
 msgid "Switch to place search"
 msgstr ""
 
-#: project/templates/event/create.html:351
-#: project/templates/event/update.html:207
+#: project/templates/event/create.html:340
+#: project/templates/event/update.html:196
 msgid "Access"
 msgstr ""
 
-#: project/templates/event/create.html:365
-#: project/templates/event/update.html:221
+#: project/templates/event/create.html:354
+#: project/templates/event/update.html:210
 msgid "Target group"
 msgstr ""
 
@@ -1690,10 +1688,6 @@ msgstr ""
 msgid "Request reference for event \"%(name)s\""
 msgstr ""
 
-#: project/templates/event_place/read.html:19
-msgid "Info"
-msgstr ""
-
 #: project/templates/event_suggestion/review.html:20
 #: project/templates/manage/reviews.html:19
 msgid "Review event suggestion"
@@ -1903,7 +1897,7 @@ msgstr ""
 msgid "Widget"
 msgstr ""
 
-#: project/templates/widget/event_date/list.html:124
+#: project/templates/widget/event_date/list.html:128
 msgid "Print"
 msgstr ""
 
@@ -1981,31 +1975,27 @@ msgstr ""
 msgid "Invitation successfully deleted"
 msgstr ""
 
-#: project/views/event.py:178
+#: project/views/event.py:177
 msgid "Event successfully published"
 msgstr ""
 
-#: project/views/event.py:180
+#: project/views/event.py:179
 msgid "Draft successfully saved"
 msgstr ""
 
-#: project/views/event.py:223
+#: project/views/event.py:222
 msgid "Event successfully updated"
 msgstr ""
 
-#: project/views/event.py:246
-msgid "Entered name does not match event name"
-msgstr ""
-
-#: project/views/event.py:252
+#: project/views/event.py:248
 msgid "Event successfully deleted"
 msgstr ""
 
-#: project/views/event.py:404
+#: project/views/event.py:403
 msgid "Referenced event changed"
 msgstr ""
 
-#: project/views/event.py:427
+#: project/views/event.py:426
 msgid "New event report"
 msgstr ""
 
@@ -2155,7 +2145,7 @@ msgstr ""
 msgid "You do not have permission for this action"
 msgstr ""
 
-#: project/views/utils.py:264
+#: project/views/utils.py:258
 msgid ""
 "The invitation was issued to another user. Sign in with the email address"
 " the invitation was sent to."
@@ -2207,3 +2197,30 @@ msgstr ""
 #~ msgid "Example"
 #~ msgstr ""
 
+#~ msgid "Indicate when the event will take place."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Indicate when the event will end. "
+#~ "An event can last a maximum of "
+#~ "14 days."
+#~ msgstr ""
+
+#~ msgid "Host"
+#~ msgstr ""
+
+#~ msgid "Show all events"
+#~ msgstr ""
+
+#~ msgid "Event date"
+#~ msgstr ""
+
+#~ msgid "Info"
+#~ msgstr ""
+
+#~ msgid "Entered name does not match event name"
+#~ msgstr ""
+
+#~ msgid "Add event date with a different time"
+#~ msgstr ""
+
diff --git a/project/views/event.py b/project/views/event.py
index 91a04d9..1dbf42a 100644
--- a/project/views/event.py
+++ b/project/views/event.py
@@ -149,6 +149,7 @@ def event_create_for_admin_unit_id(id):
             prepare_event_form_for_suggestion(form, event_suggestion)
             if form.is_submitted():
                 form.process(request.form)
+                prepare_date_definition(form)
 
     if form.validate_on_submit():
         event = Event()
@@ -310,8 +311,15 @@ def prepare_event_form(form):
     prepare_organizer(form)
     prepare_event_place(form)
 
+    prepare_date_definition(form)
+
+
+def prepare_date_definition(form):
+    next_full_hour = get_next_full_hour()
+    form.date_definition_template.start.data = next_full_hour
+
     if not form.date_definitions[0].start.data:
-        form.date_definitions[0].start.data = get_next_full_hour()
+        form.date_definitions[0].start.data = next_full_hour
 
 
 def prepare_event_form_for_suggestion(form, event_suggestion):
diff --git a/tests/api/test_event.py b/tests/api/test_event.py
index 4b646b8..2f09e20 100644
--- a/tests/api/test_event.py
+++ b/tests/api/test_event.py
@@ -157,8 +157,10 @@ def create_put(
     return data
 
 
-@pytest.mark.parametrize("legacy", [True, False])
-def test_put(client, seeder, utils, app, mocker, legacy):
+@pytest.mark.parametrize(
+    "variant", ["normal", "legacy", "recurrence", "two_date_definitions"]
+)
+def test_put(client, seeder, utils, app, mocker, variant):
     user_id, admin_unit_id = seeder.setup_api_access()
     event_id = seeder.create_event(admin_unit_id)
     place_id = seeder.upsert_default_event_place(admin_unit_id)
@@ -166,7 +168,7 @@ def test_put(client, seeder, utils, app, mocker, legacy):
 
     utils.mock_now(mocker, 2020, 1, 1)
 
-    put = create_put(place_id, organizer_id)
+    put = create_put(place_id, organizer_id, legacy=(variant == "legacy"))
     put["rating"] = 10
     put["description"] = "Neue Beschreibung"
     put["external_link"] = "http://www.google.de"
@@ -186,9 +188,12 @@ def test_put(client, seeder, utils, app, mocker, legacy):
     put["price_info"] = "Erwachsene 5€, Kinder 2€."
     put["public_status"] = "draft"
 
-    if not legacy:
+    if variant == "recurrence":
         put["date_definitions"][0]["recurrence_rule"] = "RRULE:FREQ=DAILY;COUNT=7"
 
+    if variant == "two_date_definitions":
+        put["date_definitions"].append({"start": "2021-02-07T12:00:00.000Z"})
+
     url = utils.get_url("api_v1_event", id=event_id)
     response = utils.put_json(url, put)
     utils.assert_response_no_content(response)
@@ -225,16 +230,23 @@ def test_put(client, seeder, utils, app, mocker, legacy):
         assert event.price_info == put["price_info"]
         assert event.public_status == PublicStatus.draft
 
+        if variant == "two_date_definitions":
+            assert len(event.date_definitions) == 2
+        else:
+            assert len(event.date_definitions) == 1
+
         len_dates = len(event.dates)
 
-        if legacy:
-            assert len_dates == 1
-        else:
+        if variant == "recurrence":
             assert (
                 event.date_definitions[0].recurrence_rule
                 == put["date_definitions"][0]["recurrence_rule"]
             )
             assert len_dates == 7
+        elif variant == "two_date_definitions":
+            assert len_dates == 2
+        else:
+            assert len_dates == 1
 
 
 def test_put_invalidRecurrenceRule(client, seeder, utils, app):
diff --git a/tests/api/test_organization.py b/tests/api/test_organization.py
index 9157f3b..71260b3 100644
--- a/tests/api/test_organization.py
+++ b/tests/api/test_organization.py
@@ -177,16 +177,18 @@ def prepare_events_post_data(seeder, utils, legacy=False):
     return url, data, admin_unit_id, place_id, organizer_id
 
 
-@pytest.mark.parametrize("allday", [True, False])
-@pytest.mark.parametrize("legacy", [True, False])
-def test_events_post(client, seeder, utils, app, allday, legacy):
+@pytest.mark.parametrize("variant", ["allday", "legacy", "two_date_definitions"])
+def test_events_post(client, seeder, utils, app, variant):
     url, data, admin_unit_id, place_id, organizer_id = prepare_events_post_data(
-        seeder, utils, legacy
+        seeder, utils, variant == "legacy"
     )
 
-    if allday and not legacy:
+    if variant == "allday":
         data["date_definitions"][0]["allday"] = "1"
 
+    if variant == "two_date_definitions":
+        data["date_definitions"].append({"start": "2021-02-07T12:00:00.000Z"})
+
     response = utils.post_json(url, data)
     utils.assert_response_created(response)
     assert "id" in response.json
@@ -205,7 +207,12 @@ def test_events_post(client, seeder, utils, app, allday, legacy):
         assert event.photo is not None
         assert event.photo.encoding_format == "image/png"
         assert event.public_status == PublicStatus.published
-        assert event.date_definitions[0].allday == (allday and not legacy)
+        assert event.date_definitions[0].allday == (variant == "allday")
+
+        if variant == "two_date_definitions":
+            assert len(event.date_definitions) == 2
+        else:
+            assert len(event.date_definitions) == 1
 
 
 def test_events_post_co_organizers(client, seeder, utils, app):
diff --git a/tests/form.py b/tests/form.py
index 7309ebd..dccae90 100644
--- a/tests/form.py
+++ b/tests/form.py
@@ -116,7 +116,9 @@ class Form:
         for key, value in values.items():
             if key in filled:
                 del filled[key]
-            if type(value) is list:
+            if value is None:
+                continue
+            elif type(value) is list:
                 filled.setlist(key, value)
             else:
                 filled.add(key, value)
diff --git a/tests/seeder.py b/tests/seeder.py
index 1c69f47..a18c074 100644
--- a/tests/seeder.py
+++ b/tests/seeder.py
@@ -326,6 +326,31 @@ class Seeder(object):
 
             return date_definition
 
+    def add_event_date_definition(
+        self, event_id, start=None, end=None, allday=False, recurrence_rule=""
+    ):
+        from project.models import Event
+        from project.services.event import update_event
+
+        with self._app.app_context():
+            event = Event.query.get(event_id)
+
+            date_definition = self.create_event_date_definition(
+                start, end, allday, recurrence_rule
+            )
+            date_definition.event = event
+            self._db.session.add(date_definition)
+
+            date_definitions = event.date_definitions
+            date_definitions.append(date_definition)
+            event.date_definitions = date_definitions
+            update_event(event)
+            self._db.session.commit()
+
+            date_definition_id = date_definition.id
+
+        return date_definition_id
+
     def create_event_unverified(self):
         user_id = self.create_user("unverified@test.de")
         admin_unit_id = self.create_admin_unit(user_id, "Unverified Crew")
diff --git a/tests/views/test_event.py b/tests/views/test_event.py
index 3d2d6e5..a016f26 100644
--- a/tests/views/test_event.py
+++ b/tests/views/test_event.py
@@ -53,8 +53,8 @@ def test_read_co_organizers(seeder, utils):
     utils.assert_response_contains(response, "Organizer B")
 
 
-@pytest.mark.parametrize("db_error", [True, False])
-def test_create(client, app, utils, seeder, mocker, db_error):
+@pytest.mark.parametrize("variant", ["normal", "db_error", "two_date_definitions"])
+def test_create(client, app, utils, seeder, mocker, variant):
     user_id, admin_unit_id = seeder.setup_base()
     place_id = seeder.upsert_default_event_place(admin_unit_id)
     organizer_id = seeder.upsert_default_event_organizer(admin_unit_id)
@@ -62,23 +62,28 @@ def test_create(client, app, utils, seeder, mocker, db_error):
     url = utils.get_url("event_create_for_admin_unit_id", id=admin_unit_id)
     response = utils.get_ok(url)
 
-    if db_error:
+    if variant == "db_error":
         utils.mock_db_commit(mocker, UniqueViolation("MockException", "MockException"))
 
+    data = {
+        "name": "Name",
+        "description": "Beschreibung",
+        "date_definitions-0-start": ["2030-12-31", "23:59"],
+        "event_place_id": place_id,
+        "organizer_id": organizer_id,
+        "photo-image_base64": seeder.get_default_image_upload_base64(),
+    }
+
+    if variant == "two_date_definitions":
+        data["date_definitions-1-start"] = ["2030-12-31", "14:00"]
+
     response = utils.post_form(
         url,
         response,
-        {
-            "name": "Name",
-            "description": "Beschreibung",
-            "date_definitions-0-start": ["2030-12-31", "23:59"],
-            "event_place_id": place_id,
-            "organizer_id": organizer_id,
-            "photo-image_base64": seeder.get_default_image_upload_base64(),
-        },
+        data,
     )
 
-    if db_error:
+    if variant == "db_error":
         utils.assert_response_db_error(response)
         return
 
@@ -94,6 +99,11 @@ def test_create(client, app, utils, seeder, mocker, db_error):
         )
         assert event is not None
 
+        if variant == "two_date_definitions":
+            assert len(event.date_definitions) == 2
+        else:
+            assert len(event.date_definitions) == 1
+
 
 def test_create_allday(client, app, utils, seeder):
     user_id, admin_unit_id = seeder.setup_base()
@@ -494,26 +504,43 @@ def test_actions_withReferenceLink(seeder, utils):
     assert b"Veranstaltung empfehlen" in response.data
 
 
-@pytest.mark.parametrize("db_error", [True, False])
-def test_update(client, seeder, utils, app, mocker, db_error):
+@pytest.mark.parametrize(
+    "variant", ["normal", "db_error", "add_date_definition", "remove_date_definition"]
+)
+def test_update(client, seeder, utils, app, mocker, variant):
     user_id, admin_unit_id = seeder.setup_base()
     event_id = seeder.create_event(admin_unit_id)
 
+    if variant == "remove_date_definition":
+        seeder.add_event_date_definition(event_id)
+
     url = utils.get_url("event_update", event_id=event_id)
     response = utils.get_ok(url)
 
-    if db_error:
+    if variant == "db_error":
         utils.mock_db_commit(mocker)
 
+    data = {
+        "name": "Neuer Name",
+    }
+
+    if variant == "add_date_definition":
+        data["date_definitions-1-start"] = ["2030-12-31", "14:00"]
+
+    if variant == "remove_date_definition":
+        data["date_definitions-1-csrf_token"] = None
+        data["date_definitions-1-start"] = None
+        data["date_definitions-1-end"] = None
+        data["date_definitions-1-allday"] = None
+        data["date_definitions-1-recurrence_rule"] = None
+
     response = utils.post_form(
         url,
         response,
-        {
-            "name": "Neuer Name",
-        },
+        data,
     )
 
-    if db_error:
+    if variant == "db_error":
         utils.assert_response_db_error(response)
         return
 
@@ -531,6 +558,11 @@ def test_update(client, seeder, utils, app, mocker, db_error):
         )
         assert event is not None
 
+        if variant == "add_date_definition":
+            assert len(event.date_definitions) == 2
+        else:
+            assert len(event.date_definitions) == 1
+
 
 def test_update_co_organizers(client, seeder, utils, app):
     user_id, admin_unit_id = seeder.setup_base()