diff --git a/.env.example b/.env.example
index 024a7ff..5178b54 100644
--- a/.env.example
+++ b/.env.example
@@ -10,7 +10,7 @@
 PROJECT_NAME=jama
 
 # Image version to run (set by build.sh, or use 'latest')
-JAMA_VERSION=0.9.56
+JAMA_VERSION=0.9.57
 
 # App port — the host port Docker maps to the container
 PORT=3000
diff --git a/backend/package.json b/backend/package.json
index faeaf95..2fe6c53 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jama-backend",
-  "version": "0.9.56",
+  "version": "0.9.57",
   "description": "TeamChat backend server",
   "main": "src/index.js",
   "scripts": {
diff --git a/build.sh b/build.sh
index 4dccd87..c11d23c 100644
--- a/build.sh
+++ b/build.sh
@@ -13,7 +13,7 @@
 # ─────────────────────────────────────────────────────────────
 set -euo pipefail
 
-VERSION="${1:-0.9.56}"
+VERSION="${1:-0.9.57}"
 ACTION="${2:-}"
 REGISTRY="${REGISTRY:-}"
 IMAGE_NAME="jama"
diff --git a/frontend/package.json b/frontend/package.json
index 4065730..5acde0b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jama-frontend",
-  "version": "0.9.56",
+  "version": "0.9.57",
   "private": true,
   "scripts": {
     "dev": "vite",
diff --git a/frontend/src/components/SchedulePage.jsx b/frontend/src/components/SchedulePage.jsx
index 8c39cf4..98d42d5 100644
--- a/frontend/src/components/SchedulePage.jsx
+++ b/frontend/src/components/SchedulePage.jsx
@@ -169,6 +169,8 @@ function EventForm({ event, userGroups, eventTypes, selectedDate, onSave, onCanc
   const [saving,setSaving]=useState(false);
   const [showTypeForm,setShowTypeForm]=useState(false);
   const [localTypes,setLocalTypes]=useState(eventTypes);
+  // Sync localTypes when parent provides updated eventTypes (e.g. after async load)
+  useEffect(()=>{ setLocalTypes(eventTypes); },[eventTypes]);
   const typeRef=useRef(null);
 
   // Track whether the user has manually changed the end time (vs auto-computed)
@@ -232,7 +234,7 @@ function EventForm({ event, userGroups, eventTypes, selectedDate, onSave, onCanc
 
   return (
     <div style={{width:'100%',maxWidth:1024,overflowX:'auto'}}>
-      <div style={{minWidth:500}}>
+      <div style={{minWidth:500}} onKeyDown={e=>{if(e.key==='Enter'&&e.target.tagName!=='TEXTAREA') e.preventDefault();}}>
         {/* Title */}
         <div style={{marginBottom:20}}>
           <input className="input" placeholder="Add title" value={title} onChange={e=>setTitle(e.target.value)}
@@ -243,6 +245,7 @@ function EventForm({ event, userGroups, eventTypes, selectedDate, onSave, onCanc
         <FormRow label="Event Type">
           <div style={{display:'flex',gap:8,alignItems:'center',position:'relative'}} ref={typeRef}>
             <select className="input" value={typeId} onChange={e=>setTypeId(e.target.value)} style={{flex:1}}>
+              <option value="">— Select type —</option>
               {localTypes.map(t=><option key={t.id} value={t.id}>{t.name}</option>)}
             </select>
             {isToolManager&&<button className="btn btn-secondary btn-sm" style={{flexShrink:0}} onClick={()=>setShowTypeForm(v=>!v)}>{showTypeForm?'Cancel':'+ Type'}</button>}