diff --git a/ondeck/src/components/tasks/additional-service-modal.tsx b/ondeck/src/components/tasks/additional-service-modal.tsx
index 797d3c1..b3f9d00 100644
--- a/ondeck/src/components/tasks/additional-service-modal.tsx
+++ b/ondeck/src/components/tasks/additional-service-modal.tsx
@@ -68,8 +68,13 @@ interface AdditionalServiceModalProps {
 }
 
 const PRIORITIES = ['LOW', 'MEDIUM', 'HIGH', 'CRITICAL']
-const DEPARTMENTS = ['Claims', 'Personal Lines', 'Commercial Lines', 'Benefits', 'Life', 'Other']
-const TIMINGS = ['BEFORE_RENEWAL', 'AT_RENEWAL', 'AFTER_RENEWAL', 'ONGOING']
+const DEPARTMENTS: { label: string; value: string }[] = [
+  { label: 'Claims', value: 'CLAIMS' },
+  { label: 'Personal Lines', value: 'PERSONAL_LINES' },
+  { label: 'Commercial Lines', value: 'COMMERCIAL_LINES' },
+  { label: 'Benefits', value: 'BENEFITS' },
+  { label: 'Other', value: 'OTHER' },
+]
 
 export function AdditionalServiceModal({
   open,
@@ -82,7 +87,7 @@ export function AdditionalServiceModal({
   const [title, setTitle] = useState('')
   const [description, setDescription] = useState('')
   const [priority, setPriority] = useState('MEDIUM')
-  const [department, setDepartment] = useState(DEPARTMENTS[0])
+  const [department, setDepartment] = useState(DEPARTMENTS[0].value)
   const [dueDate, setDueDate] = useState('')
   const [assignTo, setAssignTo] = useState(currentUserId)
   const [saving, setSaving] = useState(false)
@@ -106,7 +111,7 @@ export function AdditionalServiceModal({
     setTitle('')
     setDescription('')
     setPriority('MEDIUM')
-    setDepartment(DEPARTMENTS[0])
+    setDepartment(DEPARTMENTS[0].value)
     setDueDate('')
     setAssignTo(currentUserId)
     setLevel(context?.policyId ? 'policy' : context?.policyGroupId ? 'group' : 'client')
@@ -160,7 +165,7 @@ export function AdditionalServiceModal({
         priority,
         department,
         dueDate: new Date(dueDate).toISOString(),
-        timing: 'ONGOING',
+        timing: 'PRE_RENEWAL',
         daysOffset: 0,
         status: 'NOT_STARTED',
         isAdHoc: true,
@@ -336,7 +341,7 @@ export function AdditionalServiceModal({
               <Select value={department} onValueChange={setDepartment}>
                 <SelectTrigger><SelectValue /></SelectTrigger>
                 <SelectContent>
-                  {DEPARTMENTS.map((d) => <SelectItem key={d} value={d}>{d}</SelectItem>)}
+                  {DEPARTMENTS.map((d) => <SelectItem key={d.value} value={d.value}>{d.label}</SelectItem>)}
                 </SelectContent>
               </Select>
             </div>