diff --git a/inventory/urls.py b/inventory/urls.py
index 75cf7332..917d4821 100644
--- a/inventory/urls.py
+++ b/inventory/urls.py
@@ -477,7 +477,7 @@ urlpatterns = [
     #     name="payment_create",
     # ),
     # Users URLs
-    path("user/", views.UserListView.as_view(), name="user_list"),
+    path("user/<slug:dealer_slug>/", views.UserListView.as_view(), name="user_list"),
     path("user/create/", views.UserCreateView.as_view(), name="user_create"),
     path("user/<slug:slug>/", views.UserDetailView.as_view(), name="user_detail"),
     path("user/<slug:slug>/groups/", views.UserGroupView, name="user_groups"),
diff --git a/templates/dashboards/manager.html b/templates/dashboards/manager.html
index 28442d44..ad08b961 100644
--- a/templates/dashboards/manager.html
+++ b/templates/dashboards/manager.html
@@ -32,12 +32,12 @@
         </div>
         <div class="col-6 col-md-4 col-xxl-2 text-center border-translucent border-start-xxl border-end-xxl-0 border-bottom-xxl-0 border-end border-bottom pb-4 pb-xxl-0 ">
             <span class="uil fs-5 lh-1 uil-comment-alt-question text-success-dark"></span>
-            <a href="{% url 'estimate_list' %}"><h4 class="fs-6 pt-3">{{ estimates }}</h4></a>
+            <a href="{% url 'estimate_list' request.dealer.slug %}"><h4 class="fs-6 pt-3">{{ estimates }}</h4></a>
             <p class="fs-9 mb-0">{{ _("Quotations")}}</p>
         </div>
         <div class="col-6 col-md-4 col-xxl-2 text-center border-translucent border-start-xxl border-end-xxl-0 border-bottom-xxl-0 border-end border-bottom pb-4 pb-xxl-0 ">
             <span class="uil fs-5 lh-1 uil-receipt-alt text-secondary"></span>
-            <a href="{% url 'purchase_order_list' %}"><h4 class="fs-6 pt-3">{{ purchase_orders }}</h4></a>
+            <a href="{% url 'purchase_order_list' request.dealer.slug %}"><h4 class="fs-6 pt-3">{{ purchase_orders }}</h4></a>
             <p class="fs-9 mb-0">{{ _("Purchase Orders")}}</p>
         </div>
     </div>
diff --git a/templates/header.html b/templates/header.html
index 84077403..90c52d8c 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -442,7 +442,7 @@
                   {% endif %}
                   {% if request.is_dealer %}
                     <li class="nav-item">
-                      <a class="nav-link px-3 d-block" href="{% url 'user_list' %}"><span class="me-2 text-body align-bottom" data-feather="users"></span>{{ _("Staff & Groups") }}</a>
+                      <a class="nav-link px-3 d-block" href="{% url 'user_list' request.user.dealer.slug %}"><span class="me-2 text-body align-bottom" data-feather="users"></span>{{ _("Staff & Groups") }}</a>
                     </li>
                     <li class="nav-item">
                       <a class="nav-link px-3 d-block" href="{% url 'dealer_activity' %}"> <span class="me-2 text-body align-bottom" data-feather="lock"></span>{{ _("Activities") }}</a>
diff --git a/templates/purchase_orders/po_detail_backup.html b/templates/purchase_orders/po_detail_backup.html
index cc65c6b7..ca0f97fa 100644
--- a/templates/purchase_orders/po_detail_backup.html
+++ b/templates/purchase_orders/po_detail_backup.html
@@ -57,7 +57,7 @@
 
 
             <button class="btn btn-phoenix-primary" data-bs-toggle="modal" data-bs-target="#POModal"><span class="d-none d-sm-inline-block"><i class="fa-solid fa-receipt"></i>  {% trans 'View Purchase Order' %}</span></button>
-            <a href="{% url 'purchase_order_list' %}" class="btn btn-phoenix-secondary">Back to List</a>
+            <a href="{% url 'purchase_order_list' request.dealer.slug %}" class="btn btn-phoenix-secondary">Back to List</a>
 
         </div>
     </div>