diff --git a/expense_add_modal.php b/expense_add_modal.php
index 9fefa710..2d2b4682 100644
--- a/expense_add_modal.php
+++ b/expense_add_modal.php
@@ -106,6 +106,16 @@
                         <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required></textarea>
                     </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="Enter a reference">
+                        </div>
+                    </div>
+
                     <div class="form-row">
 
                         <div class="form-group col-md">
@@ -137,19 +147,39 @@
 
                         </div>
 
-                        <div class="form-group col-md">
-                            <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>
+                        <?php if (isset($_GET['client_id'])) { ?>
+                            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                        <?php }else{ ?>
+
+                            <div class="form-group col-md">
+                                <label>Client</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="client" required>
+                                        <option value="0">- Client (Optional) -</option>
+                                        <?php
+
+                                        $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC");
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $client_id = intval($row['client_id']);
+                                            $client_name = htmlentities($row['client_name']);
+                                            ?>
+                                            <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+
+                                            <?php
+                                        }
+                                        ?>
+                                    </select>
                                 </div>
-                                <input type="text" class="form-control" name="reference" placeholder="Enter a reference">
                             </div>
-                        </div>
+
+                        <?php } ?>
 
                     </div>
 
-                    <div class="form-group">
+                    <div class="form-group col-md">
                         <label>Receipt</label>
                         <input type="file" class="form-control-file" name="file">
                     </div>
diff --git a/expense_copy_modal.php b/expense_copy_modal.php
index 51e9885d..510d154e 100644
--- a/expense_copy_modal.php
+++ b/expense_copy_modal.php
@@ -103,6 +103,16 @@
                         <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required><?php echo $expense_description; ?></textarea>
                     </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="Enter a reference" value="<?php echo $expense_reference; ?>">
+                        </div>
+                    </div>
+
                     <div class="form-row">
 
                         <div class="form-group col-md">
@@ -128,15 +138,36 @@
                             </div>
                         </div>
 
-                        <div class="form-group col-md">
-                            <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>
+                        <?php if (isset($_GET['client_id'])) { ?>
+                            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                        <?php } else { ?>
+
+                            <div class="form-group col-md">
+                                <label>Client</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="client">
+                                        <option value="">- Client (Optional) -</option>
+                                        <?php
+
+                                        $sql_clients = mysqli_query($mysqli, "SELECT * 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']);
+                                            ?>
+                                            <option <?php if ($expense_client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
+
+                                            <?php
+                                        }
+                                        ?>
+                                    </select>
                                 </div>
-                                <input type="text" class="form-control" name="reference" placeholder="Enter a reference" value="<?php echo $expense_reference; ?>">
                             </div>
-                        </div>
+
+                        <?php } ?>
+
                     </div>
 
                     <div class="form-group">
diff --git a/expense_edit_modal.php b/expense_edit_modal.php
index e3f4871f..6a8532ab 100644
--- a/expense_edit_modal.php
+++ b/expense_edit_modal.php
@@ -109,6 +109,16 @@
                         <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required><?php echo $expense_description; ?></textarea>
                     </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="Enter a reference" value="<?php echo $expense_reference; ?>">
+                        </div>
+                    </div>
+
                     <div class="form-row">
 
                         <div class="form-group col-md">
@@ -137,15 +147,35 @@
                             </div>
                         </div>
 
-                        <div class="form-group col-md">
-                            <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>
+                        <?php if (isset($_GET['client_id'])) { ?>
+                            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                        <?php } else { ?>
+
+                            <div class="form-group col-md">
+                                <label>Client</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="client">
+                                        <option value="">- Client (Optional) -</option>
+                                        <?php
+
+                                        $sql_clients = mysqli_query($mysqli, "SELECT * 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']);
+                                            ?>
+                                            <option <?php if ($expense_client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
+
+                                            <?php
+                                        }
+                                        ?>
+                                    </select>
                                 </div>
-                                <input type="text" class="form-control" name="reference" placeholder="Enter a reference" value="<?php echo $expense_reference; ?>">
                             </div>
-                        </div>
+
+                        <?php } ?>
 
                     </div>
 
diff --git a/expenses.php b/expenses.php
index 1ca20bc9..602f0ab7 100644
--- a/expenses.php
+++ b/expenses.php
@@ -15,9 +15,10 @@ $sql = mysqli_query(
     LEFT JOIN categories ON expense_category_id = category_id
     LEFT JOIN vendors ON expense_vendor_id = vendor_id
     LEFT JOIN accounts ON expense_account_id = account_id
+    LEFT JOIN clients ON expense_client_id = client_id
     WHERE expense_vendor_id > 0
     AND DATE(expense_date) BETWEEN '$dtf' AND '$dtt'
-    AND (vendor_name LIKE '%$q%' OR category_name LIKE '%$q%' OR account_name LIKE '%$q%' OR expense_description LIKE '%$q%' OR expense_amount LIKE '%$q%')
+    AND (vendor_name LIKE '%$q%' OR client_name LIKE '%$q%' OR category_name LIKE '%$q%' OR account_name LIKE '%$q%' OR expense_description LIKE '%$q%' OR expense_amount LIKE '%$q%')
     ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
@@ -95,6 +96,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=expense_description&o=<?php echo $disp; ?>">Description</a></th>
                         <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=expense_amount&o=<?php echo $disp; ?>">Amount</a></th>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Account</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
                         <th class="text-center">Action</th>
                     </tr>
                     </thead>
@@ -116,6 +118,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $category_name = htmlentities($row['category_name']);
                         $account_name = htmlentities($row['account_name']);
                         $expense_account_id = intval($row['expense_account_id']);
+                        $client_name = htmlentities($row['client_name']);
+                        if(empty($client_name)) {
+                            $client_name_display = "-";
+                        } else {
+                            $client_name_display = $client_name;
+                        }
+                        $expense_client_id = intval($row['expense_client_id']);
 
                         if (empty($expense_receipt)) {
                             $receipt_attached = "";
@@ -132,6 +141,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <td><?php echo truncate($expense_description, 50); ?></td>
                             <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount, $expense_currency_code); ?></td>
                             <td><?php echo $account_name; ?></td>
+                            <td><?php echo $client_name_display; ?></td>
                             <td>
                                 <div class="dropdown dropleft text-center">
                                     <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/models/expense.php b/models/expense.php
index dbf4bad6..7224ebcf 100644
--- a/models/expense.php
+++ b/models/expense.php
@@ -3,6 +3,7 @@ $date = sanitizeInput($_POST['date']);
 $amount = floatval($_POST['amount']);
 $account = intval($_POST['account']);
 $vendor = intval($_POST['vendor']);
+$client = intval($_POST['client']);
 $category = intval($_POST['category']);
 $description = sanitizeInput($_POST['description']);
 $reference = sanitizeInput($_POST['reference']);
diff --git a/post.php b/post.php
index b58e6fc1..b23b755b 100644
--- a/post.php
+++ b/post.php
@@ -2502,7 +2502,7 @@ if(isset($_POST['add_expense'])){
 
     require_once('models/expense.php');
 
-    mysqli_query($mysqli,"INSERT INTO expenses SET expense_date = '$date', expense_amount = $amount, expense_currency_code = '$session_company_currency', expense_account_id = $account, expense_vendor_id = $vendor, expense_category_id = $category, expense_description = '$description', expense_reference = '$reference'");
+    mysqli_query($mysqli,"INSERT INTO expenses SET expense_date = '$date', expense_amount = $amount, expense_currency_code = '$session_company_currency', expense_account_id = $account, expense_vendor_id = $vendor, expense_client_id = $client, expense_category_id = $category, expense_description = '$description', expense_reference = '$reference'");
 
     $expense_id = mysqli_insert_id($mysqli);
 
@@ -2566,7 +2566,7 @@ if(isset($_POST['edit_expense'])){
         }
     }
 
-    mysqli_query($mysqli,"UPDATE expenses SET expense_date = '$date', expense_amount = $amount, expense_account_id = $account, expense_vendor_id = $vendor, expense_category_id = $category, expense_description = '$description', expense_reference = '$reference' WHERE expense_id = $expense_id");
+    mysqli_query($mysqli,"UPDATE expenses SET expense_date = '$date', expense_amount = $amount, expense_account_id = $account, expense_vendor_id = $vendor, expense_client_id = $client, expense_category_id = $category, expense_description = '$description', expense_reference = '$reference' WHERE expense_id = $expense_id");
 
     $_SESSION['alert_message'] = "Expense modified" . $extended_alert_description;