diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php
index 08d63334..a395c2f2 100755
--- a/app/Views/invoice_form.php
+++ b/app/Views/invoice_form.php
@@ -202,10 +202,11 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
                                             <option class="blueText" value="0"> + Add a customer</option>
                                         <?php } ?>
                                         <?php foreach ($customers as $customer) :
+                                        if ($customer->first_name != '' && $customer->first_name != null){
                                             if ((int)$customer->isactive == 1) {?>
                                                 <option value="<?= $customer->customer_id ?>"> <?= $customer->first_name . ' ' . $customer->last_name; ?>
                                                 </option>
-                                        <?php }
+                                        <?php } }
                                         endforeach; ?>
                                     </select>
                                 <?php } ?>
@@ -1678,7 +1679,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
                     for(i=0;i<cm.length;i++){
                         membership_id = cm[i].membership_id;
                         
-                        if(cm[i].renewed == null){
+                        if(cm[i].renewed == null && cm[i].isactive == 1){
                         console.log(cm[i]);
                         $('#membership_id').append('<option value="' + membership_id+i + '">' +cm[i].short_code + ' - '+ membership_id+' ' +cm[i].formatted_from_subscription + " To: " + cm[i].formatted_to_subscription +'</option>');