diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php
index 832cfd53..145ffe85 100644
--- a/src/Controller/WarrantyController.php
+++ b/src/Controller/WarrantyController.php
@@ -16,6 +16,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
+use DateTime;
+
 use Catalyst\MenuBundle\Annotation\Menu;
 
 class WarrantyController extends Controller
@@ -142,18 +144,24 @@ class WarrantyController extends Controller
         $em = $this->getDoctrine()->getManager();
         $obj = new Warranty();
 
+        $date_purchase = DateTime::createFromFormat('d M Y', $req->request->get('date_purchase'));
+        $date_claim = DateTime::createFromFormat('d M Y', $req->request->get('date_claim'));
+
         // set and save values
         $obj->setSerial($req->request->get('serial'))
             ->setWarrantyClass($req->request->get('warranty_class'))
             ->setFirstName($req->request->get('first_name'))
             ->setLastName($req->request->get('last_name'))
             ->setMobileNumber($req->request->get('mobile_number'))
-            ->setDatePurchase(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_purchase')))
-            ->setDateExpire(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_expire')))
-            ->setDateClaim(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_claim')))
-            ->setClaimFrom($req->request->get('claim_from'))
+            ->setDatePurchase($date_purchase)
+            ->setClaimedFrom($req->request->get('claim_from'))
             ->setStatus($req->request->get('status'));
 
+        if ($date_claim)
+        {
+            $obj->setDateClaim($date_claim);
+        }
+
         // custom validation for battery model
         $model = $em->getRepository(BatteryModel::class)
             ->find($req->request->get('battery_model'));
@@ -189,6 +197,7 @@ class WarrantyController extends Controller
         {
             $error_array['plate_number'] = 'Invalid plate number specified.';
         }
+        $obj->setPlateNumber($cleaned_plate_number);
 
         // add errors to list
         foreach ($errors as $error) {
diff --git a/templates/warranty/form.html.twig b/templates/warranty/form.html.twig
index d5c629f4..be1fab1e 100644
--- a/templates/warranty/form.html.twig
+++ b/templates/warranty/form.html.twig
@@ -132,7 +132,7 @@
                                     <div class="col-lg-6">
                                         <label data-field="date_purchase">Purchase Date</label>
                                         <div class="input-group date dp">
-                                            <input type="text" name="date_purchase" class="form-control m-input" data-default-value="{{ obj.getDatePurchase|default("now")|date('Y-m-d') }}" value="{{ obj.getDatePurchase|default("now")|date('d M Y') }}" readonly placeholder="Select a date" >
+                                            <input type="text" name="date_purchase" id="date_purchase" class="form-control m-input" value="{{ obj.getDatePurchase|default("now")|date('d M Y') }}" readonly placeholder="Select a date" >
                                             <span class="input-group-addon">
                                                 <i class="la la-calendar glyphicon-th"></i>
                                             </span>
@@ -214,7 +214,7 @@
                     text: 'Your changes have been saved!',
                     type: 'success',
                     onClose: function() {
-                        window.location.href = "{{ url('service_list') }}";
+                        window.location.href = "{{ url('warranty_list') }}";
                     }
                 });
             }).fail(function(response) {