diff --git a/expense_add_modal.php b/expense_add_modal.php
index 2d2b4682..e8d473f5 100644
--- a/expense_add_modal.php
+++ b/expense_add_modal.php
@@ -43,7 +43,7 @@
                                     <option value="">- Account -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                                    $sql = mysqli_query($mysqli, "SELECT account_id, account_name, opening_balance 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 = htmlentities($row['account_name']);
@@ -83,7 +83,7 @@
                                     <option value="">- Vendor -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
+                                    $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $vendor_id = intval($row['vendor_id']);
                                         $vendor_name = htmlentities($row['vendor_name']);
@@ -128,7 +128,7 @@
                                     <option value="">- Category -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                                    $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL ORDER BY category_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $category_id = intval($row['category_id']);
                                         $category_name = htmlentities($row['category_name']);
diff --git a/expense_copy_modal.php b/expense_copy_modal.php
index 510d154e..22fc0174 100644
--- a/expense_copy_modal.php
+++ b/expense_copy_modal.php
@@ -44,7 +44,7 @@
                                 <select class="form-control select2" name="account" required>
                                     <?php
 
-                                    $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts ORDER BY account_name ASC");
+                                    $sql_accounts = mysqli_query($mysqli, "SELECT account_id, account_name, opening_balance FROM accounts ORDER BY account_name ASC");
                                     while ($row = mysqli_fetch_array($sql_accounts)) {
                                         $account_id_select = intval($row['account_id']);
                                         $account_name_select = htmlentities($row['account_name']);
@@ -82,7 +82,7 @@
                                 <select class="form-control select2" name="vendor" required>
                                     <?php
 
-                                    $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 ORDER BY vendor_name ASC");
+                                    $sql_vendors = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 ORDER BY vendor_name ASC");
                                     while ($row = mysqli_fetch_array($sql_vendors)) {
                                         $vendor_id_select = intval($row['vendor_id']);
                                         $vendor_name_select = htmlentities($row['vendor_name']);
@@ -124,7 +124,7 @@
                                 <select class="form-control select2" name="category" required>
                                     <?php
 
-                                    $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Expense' ORDER BY category_name ASC");
+                                    $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Expense' ORDER BY category_name ASC");
                                     while ($row = mysqli_fetch_array($sql_categories)) {
                                         $category_id_select = intval($row['category_id']);
                                         $category_name_select = htmlentities($row['category_name']);
@@ -152,7 +152,7 @@
                                         <option value="">- Client (Optional) -</option>
                                         <?php
 
-                                        $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients ORDER BY client_name ASC");
+                                        $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC");
                                         while ($row = mysqli_fetch_array($sql_clients)) {
                                             $client_id_select = intval($row['client_id']);
                                             $client_name_select = htmlentities($row['client_name']);
diff --git a/expense_edit_modal.php b/expense_edit_modal.php
index 6a8532ab..a56bcf01 100644
--- a/expense_edit_modal.php
+++ b/expense_edit_modal.php
@@ -46,7 +46,7 @@
                                 <select class="form-control select2" name="account" required>
                                     <?php
 
-                                    $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts WHERE (account_archived_at > '$expense_created_at' OR account_archived_at IS NULL) ORDER BY account_name ASC");
+                                    $sql_accounts = mysqli_query($mysqli, "SELECT account_id, account_name, opening_balance FROM accounts WHERE (account_archived_at > '$expense_created_at' OR account_archived_at IS NULL) ORDER BY account_name ASC");
                                     while ($row = mysqli_fetch_array($sql_accounts)) {
                                         $account_id_select = intval($row['account_id']);
                                         $account_name_select = htmlentities($row['account_name']);
@@ -85,7 +85,7 @@
                                 <select class="form-control select2" name="vendor" required>
                                     <?php
 
-                                    $sql_select = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND (vendor_archived_at > '$expense_created_at' OR vendor_archived_at IS NULL) ORDER BY vendor_name ASC");
+                                    $sql_select = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND (vendor_archived_at > '$expense_created_at' OR vendor_archived_at IS NULL) ORDER BY vendor_name ASC");
                                     while ($row = mysqli_fetch_array($sql_select)) {
                                         $vendor_id_select = intval($row['vendor_id']);
                                         $vendor_name_select = htmlentities($row['vendor_name']);
@@ -130,7 +130,7 @@
                                 <select class="form-control select2" name="category" required>
                                     <?php
 
-                                    $sql_select = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Expense' AND (category_archived_at > '$expense_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");
+                                    $sql_select = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Expense' AND (category_archived_at > '$expense_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");
                                     while ($row = mysqli_fetch_array($sql_select)) {
                                         $category_id_select = intval($row['category_id']);
                                         $category_name_select = htmlentities($row['category_name']);
@@ -161,7 +161,7 @@
                                         <option value="">- Client (Optional) -</option>
                                         <?php
 
-                                        $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients ORDER BY client_name ASC");
+                                        $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC");
                                         while ($row = mysqli_fetch_array($sql_clients)) {
                                             $client_id_select = intval($row['client_id']);
                                             $client_name_select = htmlentities($row['client_name']);