diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index f98b9f43..00a1ea49 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -411,22 +411,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         // check if new customer
         if ($req->request->get('new_customer'))
         {
-            // get customer details
-            $c_first_name = $req->request->get('customer_first_name');
-            $c_last_name = $req->request->get('customer_last_name');
-            $c_phone_mobile = $req->request->get('customer_phone_mobile');
-            $c_phone_landline = $req->request->get('customer_phone_landline');
-            $c_phone_office = $req->request->get('customer_phone_office');
-            $c_phone_fax = $req->request->get('customer_phone_fax');
-            $c_notes = $req->request->get('customer_customer_notes');
-
-            // get customer vehicle details
-            $cv_mfg_id = $req->request->get('cv_mfg');
-            $cv_make_id = $req->request->get('cv_make');
-            $cv_year = $req->request->get('cv_year');
-            $cv_plate = $req->request->get('cv_plate');
-
-            // TODO: need to add validation
+            if (empty($req->request->get('customer_customer_notes')))
+            {
+                $error_array['customer_customer_notes'] = 'Customer notes cannot be null.';
+            }
 
             $new_cust = new Customer();
             $new_cv = new CustomerVehicle();
@@ -435,31 +423,38 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid')); 
             if (empty($new_vehicle))
             {
-                // TODO: temporary validation
-                $error_array['customer_vehicle'] = 'Invalid vehicle specified.';
+                $error_array['cv_mfg'] = 'Invalid manufacturer specified.';
+                $error_array['cv_make'] = 'Invalid make specified.';
             }
             else
             {
 
-                $new_cust->setLastName($c_last_name)
-                    ->setFirstName($c_first_name)
-                    ->setPhoneMobile($c_phone_mobile)
-                    ->setPhoneLandline($c_phone_landline)
-                    ->setPhoneOffice($c_phone_office)
-                    ->setPhoneFax($c_phone_office)
-                    ->setCustomerNotes($c_notes);
+                $new_cust->setLastName($req->request->get('customer_last_name'))
+                    ->setFirstName($req->request->get('customer_first_name'))
+                    ->setPhoneMobile($req->request->get('customer_phone_mobile'))
+                    ->setPhoneLandline($req->request->get('customer_phone_landline'))
+                    ->setPhoneOffice($req->request->get('customer_phone_office'))
+                    ->setPhoneFax($req->request->get('customer_phone_fax'))
+                    ->setCustomerNotes($req->request->get('customer_customer_notes'));
 
-                // TODO: set setHasMotoliteBattery to true if battery purchase
                 $new_cv->setCustomer($new_cust)
                     ->setVehicle($new_vehicle)
-                    ->setPlateNumber($cv_plate)
-                    ->setModelYear($cv_year)
+                    ->setPlateNumber($req->request->get('cv_plate'))
+                    ->setModelYear($req->request->get('cv_year'))
                     ->setColor('')
                     ->setStatusCondition('')
                     ->setFuelType('')
-                    ->setHasMotoliteBattery(false)
                     ->setActive();
 
+                if (($req->request->get('service_type')) == CMBServiceType::BATTERY_REPLACEMENT_NEW)
+                {
+                    $new_cv->setHasMotoliteBattery(true);
+                }
+                else
+                {
+                    $new_cv->setHasMotoliteBattery(false);
+                }
+
                 // link JO to new customer
                 $jo->setCustomer($new_cust);
                 $jo->setCustomerVehicle($new_cv);
diff --git a/src/Service/JobOrderManager.php b/src/Service/JobOrderManager.php
index 94d923a3..c54557d6 100644
--- a/src/Service/JobOrderManager.php
+++ b/src/Service/JobOrderManager.php
@@ -45,6 +45,7 @@ class JobOrderManager
             {
                 $new_battery = $item->getBattery();
                 $cust_vehicle->setCurrentBattery($new_battery);
+                $cust_vehicle->setHasMotoliteBattery(true);
             }
 
             $this->em->flush();
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index 9e82b3a6..d66a6222 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -162,7 +162,7 @@
 												<option value="{{ manufacturer.getID() }}" {% if vmfg_id == manufacturer.getID %}selected{% endif %}>{{ manufacturer.getName() }}</option>
 											{% endfor %}
 										</select>
-                                        <div class="form-control-feedback hide" data-field="cv-mfg"></div>
+                                        <div class="form-control-feedback hide" data-field="cv_mfg"></div>
                                     </div>
                                     <div class="col-lg-6">
                                         <label data-field="cv-make">Make</label>