diff --git a/templates/navigation/global_navigation.html b/templates/navigation/global_navigation.html
index 6255e604..b2311665 100644
--- a/templates/navigation/global_navigation.html
+++ b/templates/navigation/global_navigation.html
@@ -18,7 +18,7 @@
       icon="document",
       active=g.matchesPath('/requests'),
       subnav=[
-        {"label":"New Request", "href":"/requests/new/1", "icon": "plus", "active": g.matchesPath('/requests/new')},
+        {"label":"New Request", "href":url_for("requests.requests_form_new", screen=1), "icon": "plus", "active": g.matchesPath('/requests/new')},
       ]
       ) }}
     {{ SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=g.matchesPath('/workspaces')) }}
diff --git a/templates/requests.html b/templates/requests.html
index 288520ff..17993dfa 100644
--- a/templates/requests.html
+++ b/templates/requests.html
@@ -40,7 +40,7 @@
   {{ EmptyState(
     'There are currently no active requests for you to see.',
     actionLabel='Create a new JEDI Cloud Request',
-    actionHref='/requests/new',
+    actionHref=url_for('requests.requests_form_new', screen=1),
     icon='document'
   ) }}