diff --git a/app/Http/Controllers/ClientUsersController.php b/app/Http/Controllers/ClientUsersController.php
index fb81c4d..f899304 100644
--- a/app/Http/Controllers/ClientUsersController.php
+++ b/app/Http/Controllers/ClientUsersController.php
@@ -17,6 +17,7 @@ class ClientUsersController extends Controller
         $data = [
             'page_title' => 'Users',
         ];
+
         return view('client-users.index', $data);
 
     }
@@ -50,9 +51,6 @@ class ClientUsersController extends Controller
         
         return response()->json(['sessions' => $sessions]);
     }
-
-
-    // Create: Store a new record
     public function store(Request $request)
     {
         $request->validate([
@@ -64,6 +62,7 @@ class ClientUsersController extends Controller
         $session = Models\ClientSession::create([
             'email' => $request->email,
             'role'  => $request->role,
+            'client_id' => session('current_user.org_id'),
             'password' => Hash::make($request->password) 
         ]);
 
@@ -88,6 +87,7 @@ class ClientUsersController extends Controller
         $session->update([
             'email' => $request->email,
             'role'  => $request->role,
+            'client_id' => session('current_user.org_id'),
             'password' => Hash::make($request->password) 
         ]);
 
diff --git a/app/Models/ClientSession.php b/app/Models/ClientSession.php
index 0abba6f..70566fb 100644
--- a/app/Models/ClientSession.php
+++ b/app/Models/ClientSession.php
@@ -7,7 +7,5 @@ use Spatie\Permission\Traits\HasRoles;
 
 class ClientSession extends Model
 {
-    protected $guarded = [
-        'id'
-    ];
+    protected $guarded = ['id'];
 }
diff --git a/public/assets/js/traffic-mgt.js b/public/assets/js/traffic-mgt.js
index 3cd3849..4a5bd1a 100644
--- a/public/assets/js/traffic-mgt.js
+++ b/public/assets/js/traffic-mgt.js
@@ -15,7 +15,7 @@
         
         function sendDailySmsUnits() {
             document.getElementById('loadingOverlay').style.display = 'flex';
-            const endpoint = "{{ route('client.dailysmsunits') }}";
+            const endpoint = "client-dailysmsunits";
             const startDate = startDateElement.value;
             const endDate = endDateElement.value;
             fetch(endpoint, {
@@ -50,7 +50,7 @@
           }
         }
         var table = new Tabulator("#message-table", {
-            ajaxURL: base_url = "client-traffic-tabulator", // "https://smsportal.clickmlapps.com/client-traffic-tabulator/",   
+            ajaxURL: base_url = "client-traffic-tabulator",   
             ajaxConfig: {
                 method: "GET", 
                 headers: {
@@ -88,13 +88,12 @@
                   invalidPlaceholder:"(invalid date)"
                 },
                 headerFilter:function(cell, onRendered, success, cancel){
-                  // Create native date input
                   var input = document.createElement("input");
                   input.type = "date";
 
                   input.addEventListener("change", function(){
                     console.log(input.value);
-                    success(input.value); // pass value to Tabulator filter
+                    success(input.value);
                   });
 
                   return input;
@@ -103,7 +102,6 @@
                   if(!headerValue){ return true; } // no filter
                   if(!rowValue){ return false; }
 
-                  // Extract just the date portion from ISO timestamp
                   const rowDate = new Date(rowValue);
                   const formatted = rowDate.toISOString().split("T")[0]; // yyyy-MM-dd