diff --git a/app/Controllers/EnquiryController.php b/app/Controllers/EnquiryController.php
index ca2ac37..de48757 100644
--- a/app/Controllers/EnquiryController.php
+++ b/app/Controllers/EnquiryController.php
@@ -390,11 +390,11 @@ class EnquiryController extends ResourceController
                 'vehicle_type_id'   => $data['vehicle_type_id'] ?? $enquiry['vehicle_type_id'],
                 'remarks'           => $data['remarks'] ?? $enquiry['remarks'],
                 'updated_by'        => $data['updated_by'] ?? null,
+                'assigned_to'       => $data['assigned_to'] ?? $enquiry['assigned_to'],
+                'insurer_id'        => $data['insurer_id'] ?? $enquiry['insurer_id'],
+                'insurer_branch_id' => $insurerBranchresult['id'] ?? $enquiry['insurer_branch_id'],
+                'broker_id'         => $data['broker_id'] ?? $enquiry['broker_id'],
 
-                'assigned_to'      => $data['assigned_to'] ?? $enquiry['assigned_to'],
-                'insurer_id'       => $data['insurer_id'] ?? $enquiry['insurer_id'],
-                'insurer_branch_id'=> $insurerBranchresult['id'] ?? $enquiry['insurer_branch_id'],
-                'broker_id'        => $data['broker_id'] ?? $enquiry['broker_id'],
             ];
 
             // File updates
@@ -428,6 +428,11 @@ class EnquiryController extends ResourceController
 
             $this->enquiryModel->update($id, $updateData);
 
+            $enquiryData = $this->enquiryModel->find($id);
+            if($enquiryData['assigned_to'] != 0 && $enquiryData['enquiry_status'] == 'To be assigned'){
+                $this->enquiryModel->update($id, ['enquiry_status' => 'Assigned']);
+            }
+
             return $this->respond(['status' => 'success', 'code' => 200, 'message' => 'Enquiry updated successfully'], 200);
 
         } catch (\Exception $e) {