diff --git a/add_payment_modal.php b/add_payment_modal.php
index 8007e9ee..1ca54aab 100644
--- a/add_payment_modal.php
+++ b/add_payment_modal.php
@@ -116,14 +116,18 @@
             </div>
           </div>
           
+          <?php if(!empty($config_smtp_host)){ ?>
+
           <div class="form-group">
             <label>Email Receipt</label>
             <div class="custom-control custom-checkbox">
-              <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_receipt" value="1" <?php if(!empty($config_smtp_host)) echo "checked"; ?>>
+              <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_receipt" value="1" checked>
               <label class="custom-control-label" for="customControlAutosizing"><?php echo $client_email; ?></label>
             </div>
           </div>
 
+          <?php } ?>
+
         </div>
         
         <div class="modal-footer bg-white">
diff --git a/client.php b/client.php
index cd7443c7..1e24914a 100644
--- a/client.php
+++ b/client.php
@@ -27,6 +27,7 @@ if(isset($_GET['client_id'])){
   if(strlen($client_phone)>2){ 
     $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
   }
+  $client_extension = $row['client_extension'];
   $client_mobile = $row['client_mobile'];
   if(strlen($client_mobile)>2){ 
     $client_mobile = substr($row['client_mobile'],0,3)."-".substr($row['client_mobile'],3,3)."-".substr($row['client_mobile'],6,4);