diff --git a/src/event_manager_controller.js b/src/event_manager_controller.js
index d712372..21b953c 100644
--- a/src/event_manager_controller.js
+++ b/src/event_manager_controller.js
@@ -502,9 +502,15 @@ export function renderEventManagerView(context) {
       const form = new FormData(formNode);
       const name = String(form.get("teamName") || "").trim();
       const { driverIds, carIds } = getTeamCreateSelections();
-      if (!name || (!driverIds.length && !carIds.length)) {
+      if (!name) {
+        setFormError("teamCreateError", t("validation.required_name"));
         return;
       }
+      if (!driverIds.length && !carIds.length) {
+        setFormError("teamCreateError", t("validation.invalid_selection"));
+        return;
+      }
+      setFormError("teamCreateError", "");
       const createdTeam = normalizeRaceTeam({ id: uid("team"), name, driverIds, carIds });
       event.raceConfig.teams = [...getEventTeams(event), createdTeam];
       setSelectedTeamEditId(createdTeam.id);
@@ -611,7 +617,6 @@ export function renderEventManagerView(context) {
       commitTeamEdit();
     });
 
-    window.liveRcTeamAdd = () => commitTeamCreate();
     window.liveRcTeamEdit = (teamId) => {
       if (!teamId) return;
       setSelectedTeamEditId(String(teamId));
@@ -626,7 +631,6 @@ export function renderEventManagerView(context) {
       saveState();
       rerenderEventManager(eventId);
     };
-    window.liveRcTeamSaveEdit = () => commitTeamEdit();
 
 
     document.getElementById("raceFormatBasicToggle")?.addEventListener("click", () => {
diff --git a/src/event_manager_view.js b/src/event_manager_view.js
index d3f7753..be57758 100644
--- a/src/event_manager_view.js
+++ b/src/event_manager_view.js
@@ -292,7 +292,8 @@ export function renderEventManagerMarkup(context) {
           <p class="hint">${t("events.team_steps")}</p>
           <form id="teamForm" class="form-grid cols-4 team-create-form">
             <input name="teamName" required placeholder="${t("events.team_name")}" />
-            <button class="btn btn-primary" id="teamAddSave" type="button" onclick="if(window.liveRcTeamAdd){window.liveRcTeamAdd();}">${t("events.add_team")}</button>
+            <button class="btn btn-primary" id="teamAddSave" type="submit">${t("events.add_team")}</button>
+            <p class="form-error" id="teamCreateError" hidden></p>
           </form>
           <p class="hint">${t("events.team_hint")}</p>
           <div class="panel-row mt-16">
@@ -743,7 +744,7 @@ export function renderEventManagerMarkup(context) {
                     </div>
                   </div>
                   <div class="actions-inline">
-                    <button class="btn btn-primary" id="teamEditSave" type="button" onclick="if(window.liveRcTeamSaveEdit){window.liveRcTeamSaveEdit();}">${t("common.save")}</button>
+                    <button class="btn btn-primary" id="teamEditSave" type="submit">${t("common.save")}</button>
                     <button class="btn" id="teamEditCancelFooter" type="button">${t("common.cancel")}</button>
                   </div>
                 </form>