diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-create.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-create.blade.php
index 248b3b30..3132cbf3 100644
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-create.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-create.blade.php
@@ -7,7 +7,7 @@
             'Raise a new support request with priority, product/service, project, category, team and full details.',
     ])
 
-    <form wire:submit.prevent="save" enctype="multipart/form-data" class="helpdesk-ticket-form space-y-6">
+    <form wire:submit.prevent="save" enctype="multipart/form-data" class="helpdesk-ticket-form space-y-6" data-helpdesk-ticket-form>
         <div class="overflow-hidden rounded-2xl border border-zinc-700 bg-zinc-900 shadow-sm">
             <div class="border-b border-zinc-700 bg-zinc-800/80 px-6 py-4">
                 <h2 class="text-lg font-semibold text-zinc-100">Ticket details</h2>
@@ -330,13 +330,16 @@
                     class="rounded-xl bg-blue-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-blue-700">
                     Cancel
                 </a>
-
-                <button type="submit"
+                <button
+                    type="submit"
                     class="inline-flex items-center gap-2 rounded-xl bg-green-600 px-5 py-2 text-sm font-semibold text-white shadow-sm hover:bg-green-700 disabled:cursor-not-allowed disabled:opacity-50"
-                    data-dusk="ticket-create-submit" dusk="ticket-create-submit" wire:loading.attr="disabled">
+                    data-dusk="ticket-create-submit"
+                    dusk="ticket-create-submit"
+                    wire:loading.attr="disabled"
+                    wire:target="save">
                     <i class="fa-regular fa-floppy-disk" aria-hidden="true"></i>
-                    <span wire:loading.remove>Create Ticket</span>
-                    <span wire:loading>Creating...</span>
+                    <span wire:loading.remove wire:target="save">Create Ticket</span>
+                    <span wire:loading wire:target="save">Creating...</span>
                 </button>
             </div>
         </div>
@@ -411,7 +414,7 @@
             });
 
             editor.addEventListener('blur', syncBody);
-            form.addEventListener('submit', syncBody);
+            form.addEventListener('submit', syncBody, true);
         });
     </script>
 </div>
diff --git a/Modules/Platform/app/Http/Controllers/CompanyController.php b/Modules/Platform/app/Http/Controllers/CompanyController.php
index 63d4f326..8f91ecbf 100644
--- a/Modules/Platform/app/Http/Controllers/CompanyController.php
+++ b/Modules/Platform/app/Http/Controllers/CompanyController.php
@@ -15,7 +15,7 @@ class CompanyController extends Controller
     public function index()
     {
         return view('platform::companies.index', [
-            'companies' => Company::withCount(['users', 'warehouses', 'licenseKeys'])->orderBy('name')->paginate(20),
+            'companies' => Company::withCount(['users', 'warehouses', 'licenseKeys'])->latest('id')->paginate(20),
         ]);
     }