diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py
index 9cf07f05..72936ad3 100644
--- a/atst/routes/task_orders/new.py
+++ b/atst/routes/task_orders/new.py
@@ -54,7 +54,9 @@ class ShowTaskOrderWorkflow:
         if self._form:
             pass
         elif self.task_order:
-            self._form = self._section["form"](data=self.task_order.to_dictionary())
+            # None causes issues with formdata, so coerce None to ''
+            formdata = self.process_none_types(self.task_order.to_dictionary())
+            self._form = self._section["form"](formdata=formdata)
         else:
             self._form = self._section["form"]()
 
@@ -75,6 +77,12 @@ class ShowTaskOrderWorkflow:
 
         return screen_info
 
+    def process_none_types(task_order_dict):
+        for field in task_order_dict:
+            if field is None:
+                field = ''
+        return task_order_dict
+
 
 class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow):
     def __init__(self, form_data, user, screen=1, task_order_id=None):
diff --git a/templates/task_orders/new/app_info.html b/templates/task_orders/new/app_info.html
index 6116e153..724d4265 100644
--- a/templates/task_orders/new/app_info.html
+++ b/templates/task_orders/new/app_info.html
@@ -34,7 +34,7 @@
 <hr>
 
 <h3>About Your Team</h3>
-{{ OptionsInput(form.dev_team) }}
+{{ MultiCheckboxInput(form.dev_team) }}
 {{ TextInput(form.dev_team_other) }}
 {{ OptionsInput(form.team_experience) }}