diff --git a/aep-schedule-website/src/frontend/components/options/form.rs b/aep-schedule-website/src/frontend/components/options/form.rs
index c537338f6c23ec0a19523fb922ca3906846892a2..692623a768b41f475eb029b28d579890cccd1cd0 100644
--- a/aep-schedule-website/src/frontend/components/options/form.rs
+++ b/aep-schedule-website/src/frontend/components/options/form.rs
@@ -26,7 +26,14 @@ pub fn OptionsForms() -> impl IntoView {
         async move {}
     });
 
-    let submit_mobile = move |_| state.generate();
+    let submit_mobile = move |_| {
+        state.validate();
+        if state.step.get() < 5 {
+            state.hide.set(true);
+            return;
+        }
+        state.generate();
+    };
 
     view! {
         <CoursesSelector state=state submit/>