diff --git a/invoice_payment_add_modal.php b/invoice_payment_add_modal.php
index b8f77070..bdedf3c5 100644
--- a/invoice_payment_add_modal.php
+++ b/invoice_payment_add_modal.php
@@ -1,141 +1,148 @@
 <div class="modal" id="addPaymentModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i><?php echo "$invoice_prefix$invoice_number"; ?>: Make Payment</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
-        <input type="hidden" name="balance" value="<?php echo $balance; ?>">
-        <input type="hidden" name="currency_code" value="<?php echo $client_currency_code; ?>">
-        <div class="modal-body bg-white">
-          
-          <div class="form-row">
-            <div class="col-md">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i><?php echo "$invoice_prefix$invoice_number"; ?>: Make Payment</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
+                <input type="hidden" name="balance" value="<?php echo $balance; ?>">
+                <input type="hidden" name="currency_code" value="<?php echo $client_currency_code; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="form-row">
+                        <div class="col-md">
+
+                            <div class="form-group">
+                                <label>Date <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                    </div>
+                                    <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="col-md">
+
+                            <div class="form-group">
+                                <label>Amount <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($balance, 2); ?>" placeholder="0.00" required>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label>Account <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                            </div>
+                            <select class="form-control select2" name="account" required>
+                                <option value="">- Account -</option>
+                                <?php
+
+                                $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $account_type = nullable_htmlentities($row['account_type']);
+                                    if ($account_type < 19 && $account_type > 10) {
+                                        $account_id = intval($row['account_id']);
+                                        $account_name = nullable_htmlentities($row['account_name']);
+                                        $opening_balance = floatval($row['opening_balance']);
+
+                                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                                        $row = mysqli_fetch_array($sql_payments);
+                                        $total_payments = floatval($row['total_payments']);
+
+                                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                                        $row = mysqli_fetch_array($sql_revenues);
+                                        $total_revenues = floatval($row['total_revenues']);
+
+                                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                                        $row = mysqli_fetch_array($sql_expenses);
+                                        $total_expenses = floatval($row['total_expenses']);
+
+                                        $account_balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+
+                                ?>
+                                        <option <?php if ($config_default_payment_account == $account_id) {
+                                                    echo "selected";
+                                                } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($account_balance, 2); ?>]</option>
+
+                                <?php
+                                    }
+                                }
+                                ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Payment Method <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
+                            </div>
+                            <select class="form-control select2" name="payment_method" required>
+                                <option value="">- Method of Payment -</option>
+                                <?php
+
+                                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $category_name = nullable_htmlentities($row['category_name']);
+                                ?>
+                                    <option <?php if ($config_default_payment_method == $category_name) {
+                                                echo "selected";
+                                            } ?>><?php echo $category_name; ?></option>
+
+                                <?php
+                                }
+                                ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Reference</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="reference" placeholder="Check #, Trans #, etc">
+                        </div>
+                    </div>
+
+                    <?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?>
+
+                        <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" checked>
+                                <label class="custom-control-label" for="customControlAutosizing"><?php echo $contact_email; ?></label>
+                            </div>
+                        </div>
+
+                    <?php } ?>
 
-              <div class="form-group">
-                <label>Date <strong class="text-danger">*</strong></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                  </div>
-                  <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
                 </div>
-              </div>
 
-            </div>
-
-            <div class="col-md">
-            
-              <div class="form-group">
-                <label>Amount <strong class="text-danger">*</strong></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
-                  </div>
-                  <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($balance,2); ?>" placeholder="0.00" required>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="add_payment" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Pay</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
-              </div>
-
-            </div>
-
-          </div>
-
-          <div class="form-group">
-            <label>Account <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-              </div>
-              <select class="form-control select2" name="account" required>
-                <option value="">- Account -</option>
-                <?php
-                
-                $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                while ($row = mysqli_fetch_array($sql)) {
-                  $account_id = intval($row['account_id']);
-                  $account_name = nullable_htmlentities($row['account_name']);
-                  $opening_balance = floatval($row['opening_balance']);
-                  
-                  $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
-                  $row = mysqli_fetch_array($sql_payments);
-                  $total_payments = floatval($row['total_payments']);
-                  
-                  $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
-                  $row = mysqli_fetch_array($sql_revenues);
-                  $total_revenues = floatval($row['total_revenues']);
-
-                  $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
-                  $row = mysqli_fetch_array($sql_expenses);
-                  $total_expenses = floatval($row['total_expenses']);
-
-                  $account_balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
-                  
-                ?>
-                  <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($account_balance, 2); ?>]</option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Payment Method <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
-              </div>
-              <select class="form-control select2" name="payment_method" required>
-                <option value="">- Method of Payment -</option>
-                <?php
-                
-                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                while ($row = mysqli_fetch_array($sql)) {
-                  $category_name = nullable_htmlentities($row['category_name']);
-                ?>
-                  <option <?php if ($config_default_payment_method == $category_name) { echo "selected"; } ?>><?php echo $category_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label>Reference</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
-              </div>
-              <input type="text" class="form-control" name="reference" placeholder="Check #, Trans #, etc">
-            </div>
-          </div>
-          
-          <?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?>
-
-          <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" checked>
-              <label class="custom-control-label" for="customControlAutosizing"><?php echo $contact_email; ?></label>
-            </div>
-          </div>
-
-          <?php } ?>
-
+            </form>
         </div>
-        
-        <div class="modal-footer bg-white">
-          <button type="submit" name="add_payment" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Pay</button>
-          <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/settings_defaults.php b/settings_defaults.php
index 4f368e86..b026a09d 100644
--- a/settings_defaults.php
+++ b/settings_defaults.php
@@ -2,189 +2,209 @@
 
 require_once("inc_all_settings.php"); ?>
 
-    <div class="card card-dark">
-        <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-cogs mr-2"></i>Defaults</h3>
-        </div>
-        <div class="card-body">
-            <form action="post.php" method="post" autocomplete="off">
-
-                <div class="form-group">
-                    <label>Start Page</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-home"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="start_page" value="<?php echo nullable_htmlentities($config_start_page); ?>">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Calendar</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                        </div>
-                        <select class="form-control select2" name="calendar">
-                            <option value="0">- None -</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT * FROM calendars ORDER BY calendar_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $calendar_id = intval($row['calendar_id']);
-                                $calendar_name = nullable_htmlentities($row['calendar_name']); ?>
-                                <option <?php if ($config_default_calendar == $calendar_id) { echo "selected"; } ?> value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Transfer From Account</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
-                        </div>
-                        <select class="form-control select2" name="transfer_from_account">
-                            <option value="0">- None -</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $account_id = intval($row['account_id']);
-                                $account_name = nullable_htmlentities($row['account_name']); ?>
-                                <option <?php if ($config_default_transfer_from_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Transfer To Account</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
-                        </div>
-                        <select class="form-control select2" name="transfer_to_account">
-                            <option value="0">- None -</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $account_id = intval($row['account_id']);
-                                $account_name = nullable_htmlentities($row['account_name']); ?>
-                                <option <?php if ($config_default_transfer_to_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Payment Account</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
-                        </div>
-                        <select class="form-control select2" name="payment_account">
-                            <option value="0">- None -</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $account_id = intval($row['account_id']);
-                                $account_name = nullable_htmlentities($row['account_name']); ?>
-                                <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Expense Account</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                        </div>
-                        <select class="form-control select2" name="expense_account">
-                            <option value="0">- None -</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $account_id = intval($row['account_id']);
-                                $account_name = nullable_htmlentities($row['account_name']); ?>
-                                <option <?php if ($config_default_expense_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Payment Method</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
-                        </div>
-                        <select class="form-control select2" name="payment_method">
-                            <option value="">- None -</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' ORDER BY category_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $payment_method = nullable_htmlentities($row['category_name']); ?>
-                                <option <?php if ($config_default_payment_method == $payment_method) { echo "selected"; } ?>><?php echo $payment_method; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Expense Payment Method</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
-                        </div>
-                        <select class="form-control select2" name="expense_payment_method">
-                            <option value="">- None -</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' ORDER BY category_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $payment_method = nullable_htmlentities($row['category_name']); ?>
-                                <option <?php if ($config_default_expense_payment_method == $payment_method) { echo "selected"; } ?>><?php echo $payment_method; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Net Terms</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                        </div>
-                        <select class="form-control select2" name="net_terms">
-                            <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
-                                <option <?php if ($config_default_net_terms == $net_term_value) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-                <hr>
-
-                <button type="submit" name="edit_default_settings" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
-
-            </form>
-        </div>
+<div class="card card-dark">
+    <div class="card-header py-3">
+        <h3 class="card-title"><i class="fas fa-fw fa-cogs mr-2"></i>Defaults</h3>
     </div>
+    <div class="card-body">
+        <form action="post.php" method="post" autocomplete="off">
+
+            <div class="form-group">
+                <label>Start Page</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-home"></i></span>
+                    </div>
+                    <input type="text" class="form-control" name="start_page" value="<?php echo nullable_htmlentities($config_start_page); ?>">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Calendar</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                    </div>
+                    <select class="form-control select2" name="calendar">
+                        <option value="0">- None -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM calendars ORDER BY calendar_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $calendar_id = intval($row['calendar_id']);
+                            $calendar_name = nullable_htmlentities($row['calendar_name']); ?>
+                            <option <?php if ($config_default_calendar == $calendar_id) {
+                                        echo "selected";
+                                    } ?> value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
+                        <?php } ?>
+
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Transfer From Account</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
+                    </div>
+                    <select class="form-control select2" name="transfer_from_account">
+                        <option value="0">- None -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $account_id = intval($row['account_id']);
+                            $account_name = nullable_htmlentities($row['account_name']); ?>
+                            <option <?php if ($config_default_transfer_from_account == $account_id) {
+                                        echo "selected";
+                                    } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+                        <?php } ?>
+
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Transfer To Account</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
+                    </div>
+                    <select class="form-control select2" name="transfer_to_account">
+                        <option value="0">- None -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $account_id = intval($row['account_id']);
+                            $account_name = nullable_htmlentities($row['account_name']); ?>
+                            <option <?php if ($config_default_transfer_to_account == $account_id) {
+                                        echo "selected";
+                                    } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+                        <?php } ?>
+
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Payment Account</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                    </div>
+                    <select class="form-control select2" name="payment_account">
+                        <option value="0">- None -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $account_type = nullable_htmlentities($row['account_type']);
+                            if ($account_type < 19 && $account_type > 10) {
+                                $account_id = intval($row['account_id']);
+                                $account_name = nullable_htmlentities($row['account_name']); ?>
+                                <option <?php if ($config_default_payment_account == $account_id) {
+                                            echo "selected";
+                                        } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+                        <?php }
+                        }
+                        ?>
+
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Expense Account</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                    </div>
+                    <select class="form-control select2" name="expense_account">
+                        <option value="0">- None -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $account_id = intval($row['account_id']);
+                            $account_name = nullable_htmlentities($row['account_name']); ?>
+                            <option <?php if ($config_default_expense_account == $account_id) {
+                                        echo "selected";
+                                    } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+                        <?php } ?>
+
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Payment Method</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                    </div>
+                    <select class="form-control select2" name="payment_method">
+                        <option value="">- None -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' ORDER BY category_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $payment_method = nullable_htmlentities($row['category_name']); ?>
+                            <option <?php if ($config_default_payment_method == $payment_method) {
+                                        echo "selected";
+                                    } ?>><?php echo $payment_method; ?></option>
+                        <?php } ?>
+
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Expense Payment Method</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                    </div>
+                    <select class="form-control select2" name="expense_payment_method">
+                        <option value="">- None -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' ORDER BY category_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $payment_method = nullable_htmlentities($row['category_name']); ?>
+                            <option <?php if ($config_default_expense_payment_method == $payment_method) {
+                                        echo "selected";
+                                    } ?>><?php echo $payment_method; ?></option>
+                        <?php } ?>
+
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Net Terms</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                    </div>
+                    <select class="form-control select2" name="net_terms">
+                        <?php foreach ($net_terms_array as $net_term_value => $net_term_name) { ?>
+                            <option <?php if ($config_default_net_terms == $net_term_value) {
+                                        echo "selected";
+                                    } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
+                        <?php } ?>
+                    </select>
+                </div>
+            </div>
+
+            <hr>
+
+            <button type="submit" name="edit_default_settings" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+
+        </form>
+    </div>
+</div>
 
 <?php
 require_once("footer.php");
diff --git a/settings_online_payment.php b/settings_online_payment.php
index 969b4768..1bc54f78 100644
--- a/settings_online_payment.php
+++ b/settings_online_payment.php
@@ -51,16 +51,19 @@ require_once("inc_all_settings.php");
                                 <?php
                                 $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
                                 while ($row = mysqli_fetch_array($sql_accounts)) {
-                                    $account_id = intval($row['account_id']);
-                                    $account_name = nullable_htmlentities($row['account_name']); 
-                                ?>
-                                    
-                                    <option value="<?php echo $account_id ?>" <?php if ($account_id == $config_stripe_account) { echo "selected"; } ?>><?php echo $account_name ?></option>
-                                <?php 
+                                    $account_type = nullable_htmlentities($row['account_type']);
+                                    if ($account_type < 19 && $account_type > 10) {
+                                        $account_id = intval($row['account_id']);
+                                        $account_name = nullable_htmlentities($row['account_name']); 
+                                    ?>
+                                        
+                                        <option value="<?php echo $account_id ?>" <?php if ($account_id == $config_stripe_account) { echo "selected"; } ?>><?php echo $account_name ?></option>
+                                    <?php }
                                 }
                                 ?>
                             </select>
 
+
                         </div>
                     </div>