diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php
index bd5e2458..b1172eef 100644
--- a/app/Views/invoice_form.php
+++ b/app/Views/invoice_form.php
@@ -24,10 +24,11 @@
                     <div class="form-group">
                         <div class="form-row">
                             <div class="form-group col-md-6">
-                                <?php if (isset($invoice_details['customer_id']) && $invoice_details['customer_id'] != "") {
-                                    $displayvalue = "";
+                                <?php 
                                     $first_name ="";
                                     $last_name ="";
+                                    if (isset($invoice_details['customer_id']) && $invoice_details['customer_id'] != "") {
+                                    $displayvalue = "";  
                                     foreach ($customers as $customer) {
                                         if ($customer->customer_id === $invoice_details['customer_id']) {
                                             $displayvalue = $customer->first_name . ' ' . $customer->last_name;
@@ -38,9 +39,7 @@
                                     <label for="customerName">Customer Name</label>
                                     <input type="hidden" name="customer_name" id="customer_name" value="<?= $invoice_details['customer_id']; ?>" />
                                     <input type="text" class="form-control" value="<?= $displayvalue ?>" readonly />
-                                    <input type="hidden" class="form-control" id="last_name" value="<?= $last_name ?>" readonly />
-                                    <input type="hidden" class="form-control" id="first_name" value="<?= $first_name ?>" readonly />
-
+                                    
                                 <?php } else { ?>
                                     <label for="customerName">Customer Name<span class="text-danger"> *</span></label>
                                     <select class="form-control" id="customerName" name="customer_name" required data-toggle="select2" onchange="get_customer_billing_details(this.value); get_customer_membership_details(this.value)">
@@ -57,6 +56,9 @@
                                         endforeach; ?>
                                     </select>
                                 <?php } ?>
+                                <input type="hidden" class="form-control" id="hidden_last_name" value="<?= $last_name ?>" readonly />
+                                <input type="hidden" class="form-control" id="hidden_first_name" value="<?= $first_name ?>" readonly />
+
                                 <div class="invalid-feedback"> Please select customer. </div>
                                 <div class="subscribedetails" style="display: none">
                                     <div id="schemeName"></div>
@@ -1224,6 +1226,8 @@
                             state ? customer_billing_addressDetails.push(state) : "";
                             v.country_name ? customer_billing_addressDetails.push(v.country_name) : "";
                             customer_billing_id = v.customer_address_id;
+                            $('#hidden_first_name').val(v.first_name);
+                            $('#hidden_last_name').val(v.last_name);
                         });
                     }else{
                         
@@ -1292,6 +1296,8 @@
                         state ? customer_shipping_addressDetails.push(state) : "";
                         v.country_name ? customer_shipping_addressDetails.push(v.country_name) : "";
                         customer_shipping_id = v.customer_address_id;
+                        $('#hidden_first_name').val(v.first_name);
+                        $('#hidden_last_name').val(v.last_name);
                     });
                 }
                 $("#storeShippingAddress").val(customer_shipping_addressDetails.join(', \n') + ".").prop("readonly", true);
@@ -1954,10 +1960,10 @@ function saveInvoiceCustomer() {
     function submitAddress() {
         $('#storeBillingAddress').val("").prop('readonly',false);
         $('#storeShippingAddress').val("").prop('readonly',false);
-        var cus_id = $('#customer_name').val();
+        var cus_id = $('#customer_name').val() ? $('#customer_name').val() : $('#customerName').val();
         console.log("Qucik add Addresses - customer id = ",cus_id);
-        var last_name = $("#last_name").val();
-        var first_name = $("#first_name").val();
+        var last_name = $("#hidden_last_name").val();
+        var first_name = $("#hidden_first_name").val();
         var QB_AddressLine = $("#quick_billing_address").val();
         var QB_Country = $("#quick_billing_country").val();
         var QB_State = $("#quick_billing_state").val();
@@ -2034,7 +2040,7 @@ function saveInvoiceCustomer() {
                 QS_city: QS_City,
                 QS_zip: QS_PostalCode   
             };
-           
+            console.log("Before -",formData);
             $.ajax({
                 type: "POST",
                 url: "<?php echo base_url('qucik_add_addresses'); ?>",