diff --git a/data/tasks.json b/data/tasks.json
index 8239c96..905147c 100644
--- a/data/tasks.json
+++ b/data/tasks.json
@@ -482,7 +482,7 @@
       ]
     }
   ],
-  "lastUpdated": 1771551465295,
+  "lastUpdated": 1771551566326,
   "sprints": [
     {
       "name": "Sprint 1",
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 5098eed..1e3fa49 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -128,9 +128,9 @@ export default function Home() {
         ...newTask,
         projectId: selectedProjectId,
         status: newTask.status || "backlog",
-        sprintId: currentSprint?.id, // Auto-assign to current sprint
+        sprintId: newTask.sprintId || currentSprint?.id, // Use selected sprint or default to current
       } as any)
-      setNewTask({ title: "", description: "", type: "task", priority: "medium", status: "backlog", tags: [] })
+      setNewTask({ title: "", description: "", type: "task", priority: "medium", status: "backlog", tags: [], sprintId: undefined })
       setNewTaskOpen(false)
     }
   }
@@ -495,9 +495,11 @@ export default function Home() {
                   onChange={(e) => setNewTask({ ...newTask, sprintId: e.target.value || undefined })}
                   className="w-full mt-1.5 px-3 py-2 bg-slate-800 border border-slate-700 rounded-lg text-white focus:outline-none focus:border-blue-500"
                 >
-                  <option value="">No Sprint</option>
-                  {sprints.filter(s => s.projectId === selectedProjectId).map((sprint) => (
-                    <option key={sprint.id} value={sprint.id}>{sprint.name}</option>
+                  <option value="">Auto (Current Sprint)</option>
+                  {sprints.sort((a, b) => new Date(a.startDate).getTime() - new Date(b.startDate).getTime()).map((sprint) => (
+                    <option key={sprint.id} value={sprint.id}>
+                      {sprint.name} ({new Date(sprint.startDate).toLocaleDateString()})
+                    </option>
                   ))}
                 </select>
               </div>