diff --git a/app/Modules/ClientCreateForm/Views/livewire/form.blade.php b/app/Modules/ClientCreateForm/Views/livewire/form.blade.php
index 8dbc8aa..9c1fe95 100644
--- a/app/Modules/ClientCreateForm/Views/livewire/form.blade.php
+++ b/app/Modules/ClientCreateForm/Views/livewire/form.blade.php
@@ -217,11 +217,20 @@ class="bi bi-plus-circle" viewBox="0 0 16 16">
                         <select wire:model.live="agentId" class="form-select rounded-4 @error('agentId') is-invalid @enderror"
                             id="agentId" name="agent" aria-label="Агент">
                             <option selected></option>
-                            @foreach ($availableAgents as $agent)
+                            @php($currentCompanyId = false)
+                            @foreach ($availableAgents as $num=>$agent)
+                                @if($currentCompanyId !== $agent['company_id'])
+                                    @if($num !== 0)
+                                        </optgroup>
+                                    @endif
+                                    <optgroup label="{{ $agent['company']['name'] }}">
+                                    @php( $currentCompanyId = $agent['company_id'])
+                                @endif
                                 <option value="{{ $agent['id'] }}">
                                     {{ $agent['user']['name'] }}
                                 </option>
                             @endforeach
+                            </optgroup>
                         </select>
                         <label for="agentId">Агент</label>
                         @error('agentId')
diff --git a/app/Modules/Main/Helpers/helper.php b/app/Modules/Main/Helpers/helper.php
index bbe2f73..b448a9e 100644
--- a/app/Modules/Main/Helpers/helper.php
+++ b/app/Modules/Main/Helpers/helper.php
@@ -59,6 +59,7 @@ function GetAvailableAgents($resultType = 'Collection')
         }
         $agents->with('company:id,name');
         $agents->with('user:id,name');
+        $agents->orderBy('company_id');
         if ($resultType == 'Collection') {
             return $agents->get();
         } else {