diff --git a/agent/modals/client/client_add.php b/agent/modals/client/client_add.php
index f38988a9..6a954b2f 100644
--- a/agent/modals/client/client_add.php
+++ b/agent/modals/client/client_add.php
@@ -97,7 +97,7 @@ ob_start();
                             <option value="">- Select Referral -</option>
                             <?php
 
-                            while ($row = mysqli_fetch_array($referral_sql)) {
+                            while ($row = mysqli_fetch_assoc($referral_sql)) {
                                 $referral = nullable_htmlentities($row['category_name']); ?>
                                 <option><?php echo $referral; ?></option>
                             <?php } ?>
@@ -131,7 +131,7 @@ ob_start();
                         <select class="form-control select2" name="tags[]" data-placeholder="- Select Tags -"multiple>
                             <?php
 
-                            while ($row = mysqli_fetch_array($sql_tags_select)) {
+                            while ($row = mysqli_fetch_assoc($sql_tags_select)) {
                                 $tag_id_select = intval($row['tag_id']);
                                 $tag_name_select = nullable_htmlentities($row['tag_name']);
                                 ?>
diff --git a/agent/modals/client/client_bulk_add_ticket.php b/agent/modals/client/client_bulk_add_ticket.php
index d89671d1..f5ca1c87 100644
--- a/agent/modals/client/client_bulk_add_ticket.php
+++ b/agent/modals/client/client_bulk_add_ticket.php
@@ -62,7 +62,7 @@ ob_start();
                             <option value="0">- Not Categorized -</option>
                             <?php
                             $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL");
-                            while ($row = mysqli_fetch_array($sql_categories)) {
+                            while ($row = mysqli_fetch_assoc($sql_categories)) {
                                 $category_id = intval($row['category_id']);
                                 $category_name = nullable_htmlentities($row['category_name']);
 
@@ -95,7 +95,7 @@ ob_start();
                                 "SELECT user_id, user_name FROM users
                                 WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
                             );
-                            while ($row = mysqli_fetch_array($sql)) {
+                            while ($row = mysqli_fetch_assoc($sql)) {
                                 $user_id = intval($row['user_id']);
                                 $user_name = nullable_htmlentities($row['user_name']); ?>
                                 <option value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
@@ -118,7 +118,7 @@ ob_start();
                             <?php
 
                             $sql_projects = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
-                            while ($row = mysqli_fetch_array($sql_projects)) {
+                            while ($row = mysqli_fetch_assoc($sql_projects)) {
                                 $project_id_select = intval($row['project_id']);
                                 $project_name_select = nullable_htmlentities($row['project_name']); ?>
                                 <option value="<?php echo $project_id_select; ?>"><?php echo $project_name_select; ?></option>
diff --git a/agent/modals/client/client_bulk_assign_tags.php b/agent/modals/client/client_bulk_assign_tags.php
index 36c3d3dc..0c902b88 100644
--- a/agent/modals/client/client_bulk_assign_tags.php
+++ b/agent/modals/client/client_bulk_assign_tags.php
@@ -39,7 +39,7 @@ ob_start();
                     <?php
 
                     $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 ORDER BY tag_name ASC");
-                    while ($row = mysqli_fetch_array($sql_tags_select)) {
+                    while ($row = mysqli_fetch_assoc($sql_tags_select)) {
                         $tag_id_select = intval($row['tag_id']);
                         $tag_name_select = nullable_htmlentities($row['tag_name']);
                         ?>
diff --git a/agent/modals/client/client_bulk_edit_referral.php b/agent/modals/client/client_bulk_edit_referral.php
index bfb88743..a30f65bc 100644
--- a/agent/modals/client/client_bulk_edit_referral.php
+++ b/agent/modals/client/client_bulk_edit_referral.php
@@ -32,7 +32,7 @@ ob_start();
                     <option value="">- Select a Referral -</option>
                     <?php
                     $referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                    while ($row = mysqli_fetch_array($referral_sql)) {
+                    while ($row = mysqli_fetch_assoc($referral_sql)) {
                         $referral = nullable_htmlentities($row['category_name']); ?>
                         <option><?php echo $referral; ?></option>
                     <?php } ?>
diff --git a/agent/modals/client/client_credit_add.php b/agent/modals/client/client_credit_add.php
index 5ff43d73..418c30be 100644
--- a/agent/modals/client/client_credit_add.php
+++ b/agent/modals/client/client_credit_add.php
@@ -71,7 +71,7 @@
                                     <?php
 
                                     $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
+                                    while ($row = mysqli_fetch_assoc($sql)) {
                                         $client_id = intval($row['client_id']);
                                         $client_name = nullable_htmlentities($row['client_name']);
                                         ?>
diff --git a/agent/modals/client/client_edit.php b/agent/modals/client/client_edit.php
index c8f2831c..06106856 100644
--- a/agent/modals/client/client_edit.php
+++ b/agent/modals/client/client_edit.php
@@ -6,7 +6,7 @@ $client_id = intval($_GET['id']);
 
 $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_id = $client_id LIMIT 1");
 
-$row = mysqli_fetch_array($sql);
+$row = mysqli_fetch_assoc($sql);
 $client_name = nullable_htmlentities($row['client_name']);
 $client_is_lead = intval($row['client_lead']);
 $client_type = nullable_htmlentities($row['client_type']);
@@ -23,7 +23,7 @@ $client_archived_at = nullable_htmlentities($row['client_archived_at']);
 // Client Tags
 $client_tag_id_array = array();
 $sql_client_tags = mysqli_query($mysqli, "SELECT tag_id FROM client_tags WHERE client_id = $client_id");
-while ($row = mysqli_fetch_array($sql_client_tags)) {
+while ($row = mysqli_fetch_assoc($sql_client_tags)) {
     $client_tag_id = intval($row['tag_id']);
     $client_tag_id_array[] = $client_tag_id;
 }
@@ -109,7 +109,7 @@ ob_start();
                             <?php
 
                             $referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND (category_archived_at > '$client_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");
-                            while ($row = mysqli_fetch_array($referral_sql)) {
+                            while ($row = mysqli_fetch_assoc($referral_sql)) {
                                 $referral = nullable_htmlentities($row['category_name']);
                                 ?>
                                 <option <?php if ($client_referral == $referral) {
@@ -152,7 +152,7 @@ ob_start();
                             <?php
 
                             $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 ORDER BY tag_name ASC");
-                            while ($row = mysqli_fetch_array($sql_tags_select)) {
+                            while ($row = mysqli_fetch_assoc($sql_tags_select)) {
                                 $tag_id_select = intval($row['tag_id']);
                                 $tag_name_select = nullable_htmlentities($row['tag_name']);
                                 ?>