diff --git a/atst/handlers/request_new.py b/atst/handlers/request_new.py
index 055c2729..49641fc9 100644
--- a/atst/handlers/request_new.py
+++ b/atst/handlers/request_new.py
@@ -27,9 +27,12 @@ class RequestNew(BaseHandler):
         if jedi_flow.validate():
             response = yield jedi_flow.create_or_update_request(self.get_current_user())
             if response.ok:
-                where = self.application.default_router.reverse_url(
-                    "request_form_update", str(screen + 1), jedi_flow.request_id
-                )
+                if jedi_flow.next_screen >= len(jedi_flow.screens):
+                    where = "/requests"
+                else:
+                    where = self.application.default_router.reverse_url(
+                        "request_form_update", jedi_flow.next_screen, jedi_flow.request_id
+                    )
                 self.redirect(where)
             else:
                 self.set_status(response.code)
diff --git a/tests/mocks.py b/tests/mocks.py
index 2b91e25f..a04e40bf 100644
--- a/tests/mocks.py
+++ b/tests/mocks.py
@@ -61,6 +61,7 @@ class MockRequestsClient(MockApiClient):
             "id": "66b8ef71-86d3-48ef-abc2-51bfa1732b6b",
             "creator": "49903ae7-da4a-49bf-a6dc-9dff5d004238",
             "body": {},
+            "status": "incomplete",
         }
         return self._get_response("POST", path, 202, json=json)