diff --git a/frontend/src/app.rs b/frontend/src/app.rs
index 82f3cd5..0f21bbe 100644
--- a/frontend/src/app.rs
+++ b/frontend/src/app.rs
@@ -595,6 +595,8 @@ pub fn App() -> Html {
                             params.14, // reminder
                             params.15, // recurrence
                             params.16, // recurrence_days
+                            params.18, // recurrence_count
+                            params.19, // recurrence_until
                             params.17, // calendar_path
                         )
                         .await;
diff --git a/frontend/src/components/event_form/types.rs b/frontend/src/components/event_form/types.rs
index a058bcf..9c85849 100644
--- a/frontend/src/components/event_form/types.rs
+++ b/frontend/src/components/event_form/types.rs
@@ -149,6 +149,8 @@ impl EventCreationData {
         String, // recurrence
         Vec<bool>, // recurrence_days
         Option<String>, // calendar_path
+        Option<u32>, // recurrence_count
+        Option<String>, // recurrence_until
     ) {
         (
             self.title.clone(),
@@ -169,6 +171,8 @@ impl EventCreationData {
             format!("{:?}", self.recurrence),
             self.recurrence_days.clone(),
             self.selected_calendar.clone(),
+            self.recurrence_count,
+            self.recurrence_until.map(|d| d.format("%Y-%m-%d").to_string()),
         )
     }
 }
diff --git a/frontend/src/services/calendar_service.rs b/frontend/src/services/calendar_service.rs
index 2fe2348..f0b64c1 100644
--- a/frontend/src/services/calendar_service.rs
+++ b/frontend/src/services/calendar_service.rs
@@ -1249,6 +1249,8 @@ impl CalendarService {
         reminder: String,
         recurrence: String,
         recurrence_days: Vec<bool>,
+        recurrence_count: Option<u32>,
+        recurrence_until: Option<String>,
         calendar_path: Option<String>,
     ) -> Result<(), String> {
         let window = web_sys::window().ok_or("No global window exists")?;
@@ -1281,8 +1283,8 @@ impl CalendarService {
                 "recurrence": recurrence,
                 "recurrence_days": recurrence_days,
                 "recurrence_interval": 1_u32, // Default interval
-                "recurrence_end_date": None as Option<String>, // No end date by default
-                "recurrence_count": None as Option<u32>, // No count limit by default
+                "recurrence_end_date": recurrence_until,
+                "recurrence_count": recurrence_count,
                 "calendar_path": calendar_path
             });
             let url = format!("{}/calendar/events/series/create", self.base_url);