diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index c858fb59e..03e229236 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -117,18 +117,27 @@
           "active": header_navigation.is_selected('user-profile')
         }
       ] %}
-      {% set secondaryNavigation = [
-        {
-          "href": url_for('.service_settings', service_id=current_service.id),
-          "text": "Settings",
-          "active": secondary_navigation.is_selected('settings')
-        },
-        {
-          "href": url_for('main.sign_out'),
-          "text": "Sign out"
-        }
-      ] %}
-    {% endif %}
+      {% if current_service %}
+        {% set secondaryNavigation = [
+          {
+            "href": url_for('main.service_settings', service_id=current_service.id),
+            "text": "Settings",
+            "active": secondary_navigation.is_selected('settings')
+          },
+          {
+            "href": url_for('main.sign_out'),
+            "text": "Sign out"
+          }
+        ] %}
+        {% else %}
+          {% set secondaryNavigation = [
+            {
+            "href": url_for('main.sign_out'),
+            "text": "Sign out"
+            }
+          ] %}
+        {% endif %}
+      {% endif %}
   {% else %}
   <!-- Add navigation back after pilot -->
     {# {% set navigation = [
diff --git a/app/templates/settings_nav.html b/app/templates/settings_nav.html
index e6fbbe437..d94c417e7 100644
--- a/app/templates/settings_nav.html
+++ b/app/templates/settings_nav.html
@@ -5,11 +5,11 @@
   <ul class="usa-sidenav">
     {# {% if current_user.has_permissions() %} #}
     <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('settings') }}"
-      href="{{ url_for('.service_settings', service_id=current_service.id) }}">General</a></li>
+      href="{{ url_for('main.service_settings', service_id=current_service.id) }}">General</a></li>
     <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('user-profile') }}"
       href="{{ url_for('main.user_profile', service_id=current_service.id) }}">User profile</a></li>
     <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('team-members') }}"
-        href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
+        href="{{ url_for('main.manage_users', service_id=current_service.id) }}">Team members</a></li>
     {# {% endif %} #}
   </ul>
 </nav>
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index 010b53d5d..95b67d3ad 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -1052,9 +1052,9 @@ def test_menu_send_messages(
         in page
     )
     # assert url_for('main.uploads', service_id=service_one['id']) in page
-    assert url_for("main.manage_users", service_id=service_one["id"]) in page
+    assert url_for("main.manage_users", service_id=service_one["id"]) not in page
 
-    assert url_for("main.service_settings", service_id=service_one["id"]) not in page
+    assert url_for("main.service_settings", service_id=service_one["id"]) in page
     # assert url_for('main.api_keys', service_id=service_one['id']) not in page
 
 
@@ -1086,7 +1086,7 @@ def test_menu_manage_service(
         )
         in page
     )
-    assert url_for("main.manage_users", service_id=service_one["id"]) in page
+    # assert url_for("main.manage_users", service_id=service_one["id"]) in page
     assert url_for("main.service_settings", service_id=service_one["id"]) in page
 
     # assert url_for('main.api_keys', service_id=service_one['id']) not in page
@@ -1122,8 +1122,8 @@ def test_menu_manage_api_keys(
         )
         in page
     )
-    assert url_for("main.manage_users", service_id=service_one["id"]) in page
-    assert url_for("main.service_settings", service_id=service_one["id"]) in page
+    # assert url_for("main.manage_users", service_id=service_one["id"]) not in page
+    # assert url_for("main.service_settings", service_id=service_one["id"]) not in page
     assert url_for("main.api_integration", service_id=service_one["id"]) in page
 
 
@@ -1145,8 +1145,8 @@ def test_menu_all_services_for_platform_admin_user(
     )
     page = str(page)
     assert url_for("main.choose_template", service_id=service_one["id"]) in page
-    assert url_for("main.manage_users", service_id=service_one["id"]) in page
-    assert url_for("main.service_settings", service_id=service_one["id"]) in page
+    # assert url_for("main.manage_users", service_id=service_one["id"]) in page
+    # assert url_for("main.service_settings", service_id=service_one["id"]) in page
     # assert url_for('main.view_notifications', service_id=service_one['id'], message_type='email') in page
     assert (
         url_for(