diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php
index 9bcba369..a0647481 100644
--- a/src/Controller/WarrantyController.php
+++ b/src/Controller/WarrantyController.php
@@ -186,7 +186,8 @@ class WarrantyController extends Controller
             ->setOutletContactNumber($req->request->get('outlet_contact_number', ''))
             ->setSenderName($req->request->get('sender_name', ''))
             ->setSenderContactNumber($req->request->get('sender_contact_number', ''))
-            ->setOutletAddress($req->request->get('outlet_address', ''));
+            ->setOutletAddress($req->request->get('outlet_address', ''))
+            ->setSalesInvoiceNumber($req->request->get('sales_invoice_number', ''));
 
         if ($date_claim)
         {
@@ -293,6 +294,7 @@ class WarrantyController extends Controller
                 'sender_name' => $req->request->get('sender_name', ''),
                 'sender_contact_number' => $req->request->get('sender_contact_number', ''),
                 'outlet_address' => $req->request->get('outlet_address', ''),
+                'sales_invoice_number' => $req->request->get('sales_invoice_number', ''),
             ];
             $logger->logWarrantyInfo($log_data, '', $user_id, $action, $source);
 
@@ -363,7 +365,8 @@ class WarrantyController extends Controller
             ->setOutletContactNumber($req->request->get('outlet_contact_number', ''))
             ->setSenderName($req->request->get('sender_name', ''))
             ->setSenderContactNumber($req->request->get('sender_contact_number', ''))
-            ->setOutletAddress($req->request->get('outlet_address', ''));
+            ->setOutletAddress($req->request->get('outlet_address', ''))
+            ->setSalesInvoiceNumber($req->request->get('sales_invoice_number', ''));
 
         if ($date_claim)
         {
diff --git a/src/Entity/Warranty.php b/src/Entity/Warranty.php
index 018173cf..f9971fb4 100644
--- a/src/Entity/Warranty.php
+++ b/src/Entity/Warranty.php
@@ -275,6 +275,12 @@ class Warranty
      */
     protected $outlet_address;
 
+    // for non-motiv warranties created via admin panel
+    /**
+     * @ORM\Column(type="string", length=30, options={"default": ""})
+     */
+    protected $sales_invoice_num;
+
     public function __construct()
     {
         $this->date_create = new DateTime();
@@ -292,6 +298,7 @@ class Warranty
         $this->sender_name = '';
         $this->sender_contact_num = '';
         $this->outlet_address = '';
+        $this->sales_invoice_num = '';
     }
 
     public function getID()
@@ -785,4 +792,15 @@ class Warranty
     {
         return $this->outlet_address;
     }
+
+    public function setSalesInvoiceNumber($sales_invoice_num)
+    {
+        $this->sales_invoice_num = $sales_invoice_num;
+        return $this;
+    }
+
+    public function getSalesInvoiceNumber()
+    {
+        return $this->sales_invoice_num;
+    }
 }
diff --git a/templates/warranty/form.html.twig b/templates/warranty/form.html.twig
index 33a0d795..7107d5e9 100644
--- a/templates/warranty/form.html.twig
+++ b/templates/warranty/form.html.twig
@@ -184,47 +184,50 @@
                                 </div>
                                 <div class="form-group m-form__group row">
                                     <div class="col-lg-4">
-                                        <div class="col-lg-12 form-group-inner">
-                                            <label data-field="sender_name">
-                                                Sender Name
-                                            </label>
-                                            <input type="text" name="sender_name" class="form-control m-input" value="{{ obj.getSenderName }}" data-name="sender_name">
-                                            <div class="form-control-feedback hide" data-field="sender_name"></div>
-                                        </div>
-                                        <br>
-                                        <div class="col-lg-12 form-group-inner">
-                                            <label data-field="sender_contact_number">
-                                                Sender Contact Number
-                                            </label>
-                                            <input type="text" name="sender_contact_number" class="form-control m-input" value="{{ obj.getSenderContactNumber }}" data-name="sender_contact_number">
-                                            <div class="form-control-feedback hide" data-field="sender_contact_number"></div> 
-                                        </div>
+                                        <label data-field="sales_invoice_number">
+                                            Sales Invoice Number
+                                        </label>
+                                        <input type="text" name="sales_invoice_number" class="form-control m-input" value="{{ obj.getSalesInvoiceNumber }}" data-name="sales_invoice_number">
+                                        <div class="form-control-feedback hide" data-field="sales_invoice_number"></div>
                                     </div>
                                     <div class="col-lg-4">
-                                        <div class="col-lg-12 form-group-inner">
-                                            <label data-field="outlet_name">
-                                                Outlet Name
-                                            </label>
-                                            <input type="text" name="outlet_name" class="form-control m-input" value="{{ obj.getOutletName }}" data-name="outlet_name">
-                                            <div class="form-control-feedback hide" data-field="outlet_name"></div>
-                                        </div>
-                                        <br>
-                                        <div class="col-lg-12 form-group-inner">
-                                            <label data-field="outlet_contact_number">
-                                                Outlet Contact Number
-                                            </label>
-                                            <input type="text" name="outlet_contact_number" class="form-control m-input" value="{{ obj.getOutletContactNumber }}" data-name="outlet_contact_number">
-                                            <div class="form-control-feedback hide" data-field="outlet_contact_number"></div>
-                                        </div>
+                                        <label data-field="outlet_name">
+                                            Outlet Name
+                                        </label>
+                                        <input type="text" name="outlet_name" class="form-control m-input" value="{{ obj.getOutletName }}" data-name="outlet_name">
+                                        <div class="form-control-feedback hide" data-field="outlet_name"></div>
                                     </div>
                                     <div class="col-lg-4">
-                                        <div class="col-lg-12 form-group-inner">
-                                            <label data-field="outlet_address">
-                                                Outlet Address
-                                            </label>
-                                            <textarea name="outlet_address" class="form-control m-input" data-name="outlet_address" rows="6">{{ obj.getOutletAddress }}</textarea>
-                                            <div class="form-control-feedback hide" data-field="outlet_address"></div>
-                                        </div>
+                                        <label data-field="outlet_contact_number">
+                                            Outlet Contact Number
+                                        </label>
+                                        <input type="text" name="outlet_contact_number" class="form-control m-input" value="{{ obj.getOutletContactNumber }}" data-name="outlet_contact_number">
+                                        <div class="form-control-feedback hide" data-field="outlet_contact_number"></div>
+                                    </div>
+                                </div>
+                                <div class="form-group m-form__group row">
+                                    <div class="col-lg-12">
+                                        <label data-field="outlet_address">
+                                            Outlet Address
+                                        </label>
+                                        <textarea name="outlet_address" class="form-control m-input" data-name="outlet_address" rows="3">{{ obj.getOutletAddress }}</textarea>
+                                        <div class="form-control-feedback hide" data-field="outlet_address"></div>
+                                    </div>
+                                </div>
+                                <div class="form-group m-form__group row">
+                                    <div class="col-lg-6">
+                                        <label data-field="sender_name">
+                                            Sender Name
+                                        </label>
+                                        <input type="text" name="sender_name" class="form-control m-input" value="{{ obj.getSenderName }}" data-name="sender_name">
+                                        <div class="form-control-feedback hide" data-field="sender_name"></div>
+                                    </div>
+                                    <div class="col-lg-6">
+                                        <label data-field="sender_contact_number">
+                                            Sender Contact Number
+                                        </label>
+                                        <input type="text" name="sender_contact_number" class="form-control m-input" value="{{ obj.getSenderContactNumber }}" data-name="sender_contact_number">
+                                        <div class="form-control-feedback hide" data-field="sender_contact_number"></div>
                                     </div>
                                 </div>
                             </div>