diff --git a/templates/groups/group_detail.html b/templates/groups/group_detail.html
index 1c2d9040..fc2e0b79 100644
--- a/templates/groups/group_detail.html
+++ b/templates/groups/group_detail.html
@@ -28,7 +28,7 @@
                     </button>
                     <a type="button"
                        class="btn btn-sm btn-phoenix-danger"
-                       href="{% url 'group_delete' group.id %}">
+                       href="{% url 'group_delete' request.dealer.slug group.id %}">
                         {% trans 'Yes' %}
                     </a>
                 </div>
@@ -74,7 +74,7 @@
                     <div class="card-header ">
                     </div>
                     <h4 class="my-4">Permissions</h4>
-                    <a class="btn btn-sm btn-phoenix-primary mt-2 mb-4" href="{% url 'group_permission' group.id %}"><i class="fa-solid fa-unlock"></i> Manage Permissions</a>
+                    <a class="btn btn-sm btn-phoenix-primary mt-2 mb-4" href="{% url 'group_permission' request.dealer.slug group.id %}"><i class="fa-solid fa-unlock"></i> Manage Permissions</a>
 
                     <table class="table table-hover table-responsive-sm fs-9 mb-0">
                         <thead>
@@ -98,7 +98,7 @@
                     </table>
                 </div>
                 <div class="card-footer d-flex ">
-                    <a class="btn btn-sm btn-phoenix-primary me-1" href="{% url 'group_update' group.id %}">
+                    <a class="btn btn-sm btn-phoenix-primary me-1" href="{% url 'group_update' request.dealer.slug group.id %}">
                         <i class="fa-solid fa-pen-to-square"></i>
                         {{ _("Edit") }}
                     </a>
@@ -109,7 +109,7 @@
                         {{ _("Delete") }}
                     </a>
                     <a class="btn btn-sm btn-phoenix-secondary"
-                       href="{% url 'group_list' %}">
+                       href="{% url 'group_list'  request.dealer.slug%}">
                         <i class="fa-solid fa-arrow-left"></i>
                         {% trans "Back to List" %}
                     </a>
diff --git a/templates/groups/group_list.html b/templates/groups/group_list.html
index f50937a9..f20bc986 100644
--- a/templates/groups/group_list.html
+++ b/templates/groups/group_list.html
@@ -11,7 +11,7 @@
             <div class="col-auto">
                 <div class="d-md-flex justify-content-between">
                     <div>
-                        <a href="{% url 'group_create' %}" class="btn btn-sm btn-phoenix-primary"><span class="fas fa-plus me-2"></span>{% trans "Add Group" %}</a>
+                        <a href="{% url 'group_create' request.dealer.slug %}" class="btn btn-sm btn-phoenix-primary"><span class="fas fa-plus me-2"></span>{% trans "Add Group" %}</a>
 
                     </div>
                 </div>
@@ -35,7 +35,7 @@
                                 <td class="align-middle white-space-nowrap"><i class="fa-solid fa-unlock me-1"></i> {{ group.permissions.count }}</td>
                                 <td class="align-middle white-space-nowrap">
                                     <a class="btn btn-phoenix-success"
-                                       href="{% url 'group_detail' group.id %}">
+                                       href="{% url 'group_detail' request.dealer.slug group.id %}">
                                         <i class="fa-solid fa-eye"></i>
                                         {% trans 'view'|capfirst %}
                                     </a>
diff --git a/templates/users/user_detail.html b/templates/users/user_detail.html
index ff4325b3..d2337e9f 100644
--- a/templates/users/user_detail.html
+++ b/templates/users/user_detail.html
@@ -23,11 +23,11 @@
                 </div>
             </div>
             <div class="table-responsive scrollbar mx-n1 px-1">
-                <div class="card-header ">
+                <div class="card-header ">                                  
 
                 </div>
                 <h4 class="my-4">Groups</h4>
-                <a class="btn btn-sm btn-phoenix-primary mt-2 mb-4" href="{% url 'user_groups' user_.slug %}"><i class="fa-solid fa-users"></i> Manage Groups</a>
+                <a class="btn btn-sm btn-phoenix-primary mt-2 mb-4" href="{% url 'user_groups'   user.slug %}"><i class="fa-solid fa-users"></i> Manage Groups</a>
                 <table class="table table-hover table-responsive-sm fs-9 mb-0">
                     <thead>
                         <tr>
diff --git a/templates/users/user_list.html b/templates/users/user_list.html
index cbb6be8c..d1c04464 100644
--- a/templates/users/user_list.html
+++ b/templates/users/user_list.html
@@ -12,8 +12,8 @@
                 <div class="d-md-flex justify-content-between">
                     <div>
                         {% if request.user.userplan %}
-                            <a href="{% url 'user_create' %}" class="btn btn-sm btn-phoenix-primary me-4"><i class="fa-solid fa-user-tie me-1"></i> {% trans "Add New Staff" %}</a>
-                            <a href="{% url 'group_list' %}" class="btn btn-sm btn-phoenix-success"><i class="fa-solid fa-user-group me-1"></i> {% trans "Manage Groups & Permissions" %}</a>
+                            <a href="{% url 'user_create' request.dealer.slug %}" class="btn btn-sm btn-phoenix-primary me-4"><i class="fa-solid fa-user-tie me-1"></i> {% trans "Add New Staff" %}</a>
+                            <a href="{% url 'group_list' request.dealer.slug %}" class="btn btn-sm btn-phoenix-success"><i class="fa-solid fa-user-group me-1"></i> {% trans "Manage Groups & Permissions" %}</a>
                         {% else %}
                             <div class="alert alert-outline-warning d-flex align-items-center" role="alert">
                                 <i class="fa-solid fa-circle-info fs-6"></i>
@@ -41,7 +41,7 @@
                             <tr>
                                 <td class="align-middle white-space-nowrap ps-1">
                                     <div>
-                                        <a class="fs-8 fw-bold" href="{% url 'user_detail' user.slug%}">{{ user.arabic_name }}</a>
+                                        <a class="fs-8 fw-bold" href="{% url 'user_detail' request.dealer.slug user.slug%}">{{ user.arabic_name }}</a>
 
                                     </div>
                                 </td>
@@ -53,7 +53,7 @@
 
                                 <td class="align-middle white-space-nowrap">
                                     <a class="btn btn-phoenix-success"
-                                       href="{% url 'user_detail' user.slug %}">
+                                       href="{% url 'user_detail' request.dealer.slug user.slug %}">
                                         <i class="fa-solid fa-eye"></i>
                                         {% trans 'view'|capfirst %}
                                     </a>