diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 0e1a4e27..44714f44 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -2539,6 +2539,19 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 // validated, no error. save the job order
                 $em->persist($jo);
 
+                // the event
+                $event = new JOEvent();
+                $event->setDateHappen(new DateTime())
+                    ->setTypeID(JOEventType::CREATE)
+                    ->setJobOrder($jo);
+
+                if ($user != null)
+                {
+                    $event->setUser($user);
+                }
+
+                $em->persist($event);
+
                 // save to customer vehicle battery record
                 $this->updateVehicleBattery($jo);
 
@@ -2547,7 +2560,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 $cust_vehicle->setWarrantyCode($req->request->get('warranty_code'));
 
                 $em->persist($cust_vehicle);
-                $em->flush();
 
                 // create the warranty if new battery only
                 if ($this->checkIfNewBattery($jo))
@@ -2589,18 +2601,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                     }
                 }
 
-                // the event
-                $event = new JOEvent();
-                $event->setDateHappen(new DateTime())
-                    ->setTypeID(JOEventType::CREATE)
-                    ->setJobOrder($jo);
-
-                if ($user != null)
-                {
-                    $event->setUser($user);
-                }
-
-                $em->persist($event);
                 $em->flush();
             }
         }