diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py
index b716d069..b7c4ce2b 100644
--- a/atst/routes/task_orders/new.py
+++ b/atst/routes/task_orders/new.py
@@ -262,6 +262,6 @@ def update(screen, task_order_id=None, portfolio_id=None):
             current=screen,
             task_order_id=task_order_id,
             portfolio_id=portfolio_id,
-            screens=TASK_ORDER_SECTIONS,
+            screens=workflow.display_screens,
             form=workflow.form,
         )
diff --git a/tests/routes/task_orders/test_new_task_order.py b/tests/routes/task_orders/test_new_task_order.py
index 13c1e49d..1bdf97d5 100644
--- a/tests/routes/task_orders/test_new_task_order.py
+++ b/tests/routes/task_orders/test_new_task_order.py
@@ -100,11 +100,10 @@ def test_create_new_task_order_for_portfolio(client, user_session):
 
 
 def test_task_order_form_shows_errors(client, user_session):
-    creator = UserFactory.create()
+    to = task_order()
+    creator = to.creator
     user_session(creator)
 
-    to = TaskOrderFactory.create()
-
     task_order_data = TaskOrderFactory.dictionary()
     funding_data = slice_data_for_section(task_order_data, "funding")
     funding_data = serialize_dates(funding_data)