diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py
index 235e5384..5302fa00 100644
--- a/atst/routes/task_orders/new.py
+++ b/atst/routes/task_orders/new.py
@@ -206,20 +206,22 @@ def get_started():
 @task_orders_bp.route("/task_orders/new/<int:screen>/<task_order_id>")
 @task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/new/<int:screen>")
 def new(screen, task_order_id=None, portfolio_id=None):
+    workflow = ShowTaskOrderWorkflow(g.current_user, screen, task_order_id)
+    template_args = {
+        "current": screen,
+        "task_order_id": task_order_id,
+        "screens": workflow.display_screens,
+        "form": workflow.form,
+        "complete": workflow.is_complete,
+    }
+
     if task_order_id and screen is 4:
         task_order = TaskOrders.get(g.current_user, task_order_id)
         if not TaskOrders.all_sections_complete(task_order):
             flash("task_order_draft")
 
-    workflow = ShowTaskOrderWorkflow(g.current_user, screen, task_order_id)
-    template_args = {
-        "current": screen,
-        "task_order_id": task_order_id,
-        "portfolio_id": portfolio_id,
-        "screens": workflow.display_screens,
-        "form": workflow.form,
-        "complete": workflow.is_complete,
-    }
+    if portfolio_id:
+        template_args["portfolio"] = Portfolios.get(g.current_user, portfolio_id)
 
     url_args = {"screen": screen}
     if task_order_id:
@@ -237,11 +239,6 @@ def new(screen, task_order_id=None, portfolio_id=None):
                 task_order_id=task_order_id,
             )
             url_args["next"] = template_args["next"]
-    elif http_request.args.get("new_to_on_portfolio"):
-        portfolio = Portfolios.get(g.current_user, portfolio_id)
-        template_args["portfolio_name"] = portfolio.name
-        template_args["defense_component"] = portfolio.defense_component
-        template_args["new_to_on_portfolio"] = True
 
     template_args["action_url"] = url_for("task_orders.update", **url_args)
 
diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html
index 002111be..c26bd969 100644
--- a/templates/portfolios/task_orders/index.html
+++ b/templates/portfolios/task_orders/index.html
@@ -93,7 +93,7 @@
 <div class="portfolio-funding">
 
   <div class='portfolio-funding__header row'>
-    <a href="{{ url_for("task_orders.new", screen=1, portfolio_id=portfolio.id, new_to_on_portfolio=True) }}" class="usa-button">Start a New Task Order</a>
+    <a href="{{ url_for("task_orders.new", screen=1, portfolio_id=portfolio.id) }}" class="usa-button">Start a New Task Order</a>
   </div>
 
   {% for task_order in pending_task_orders %}
diff --git a/templates/task_orders/new/app_info.html b/templates/task_orders/new/app_info.html
index 19e1b361..40462bb8 100644
--- a/templates/task_orders/new/app_info.html
+++ b/templates/task_orders/new/app_info.html
@@ -16,8 +16,8 @@
 <!-- App Info Section -->
 <h3 class="task-order-form__heading subheading">{{ "task_orders.new.app_info.basic_info_title"| translate }}</h3>
 
-{% if new_to_on_portfolio %}
-    {{ ReviewField(heading="forms.portfolio.name_label" | translate, field=portfolio_name) }}
+{% if portfolio %}
+    {{ ReviewField(heading="forms.portfolio.name_label" | translate, field=portfolio.name) }}
 {% else %}
     {{ TextInput(form.portfolio_name, placeholder="The name of your office or organization", validation="portfolioName") }}
     {{ TextInput(form.scope, paragraph=True) }}
@@ -25,8 +25,8 @@
 {% endif %}
 
 <div class="subheading--black">
-    {% if new_to_on_portfolio %}
-        {{ ReviewField(heading="forms.task_order.defense_component_label" | translate, field=defense_component) }}
+    {% if portfolio %}
+        {{ ReviewField(heading="forms.task_order.defense_component_label" | translate, field=portfolio.defense_component) }}
     {% else %}
         {{ OptionsInput(form.defense_component) }}
     {% endif %}