diff --git a/account_add_modal.php b/account_add_modal.php
index 93ab7166..08df7019 100644
--- a/account_add_modal.php
+++ b/account_add_modal.php
@@ -33,8 +33,11 @@
                             while ($row = mysqli_fetch_array($sql_account_types)) {
                                 $account_type_id = intval($row['account_type_id']);
                                 $account_type_name = nullable_htmlentities($row['account_type_name']);
-                                if($account_type_id % 10 != 0) {
-                                    echo "<option value='$account_type_id'>$account_type_name</option>";}}?>
+
+                                echo "<option value='$account_type_id'>$account_type_name</option>";
+                                
+                            }
+                            ?>
                             </select>
                         </div>
                     </div>
diff --git a/account_edit_modal.php b/account_edit_modal.php
index 522a3e30..94847ec1 100644
--- a/account_edit_modal.php
+++ b/account_edit_modal.php
@@ -19,6 +19,7 @@
                             <input type="text" class="form-control" name="name" value="<?php echo $account_name; ?>" placeholder="Account name" required>
                         </div>
                     </div>
+                    
                     <div class="form-group">
                         <label>Account Type <strong class="text-danger">*</strong></label>
                         <div class="input-group">
@@ -26,28 +27,25 @@
                                 <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
                             </div>
                             <select class="form-control select" name="type" required>
-                            <option value="">- Select -</option>
                             <?php
-                            $sql_account_type = mysqli_query($mysqli, "SELECT * FROM account_types WHERE account_type_id = $account_type_id");
-                            $row = mysqli_fetch_array($sql_account_type);
-                            $account_type_name = nullable_htmlentities($row['account_type_name']);
-                            echo "<option value='$account_type_id' selected>$account_type_name</option>";
+                            $sql_account_types_select = mysqli_query($mysqli, "SELECT * FROM account_types ORDER BY account_type_name ASC");
+                            while ($row = mysqli_fetch_array($sql_account_types_select)) {
+                                $account_type_id_select = intval($row['account_type_id']);
+                                $account_type_name_select = nullable_htmlentities($row['account_type_name']);
+                                ?>
+                                <option value="<?php echo $account_type_id_select; ?>" <?php if($account_type == $account_type_id_select){ echo "selected"; } ?>><?php echo $account_type_name_select; ?></option>
+                            <?php
+                            }
                             ?>
-                            <option value="">----------------</option>
-                            <?php
-                            $sql_account_types = mysqli_query($mysqli, "SELECT * FROM account_types ORDER BY account_type_name ASC");
-                            while ($row = mysqli_fetch_array($sql_account_types)) {
-                                $account_type_id = intval($row['account_type_id']);
-                                $account_type_name = nullable_htmlentities($row['account_type_name']);
-                                if($account_type_id % 10 != 0) {
-                                    echo "<option value='$account_type_id'>$account_type_name</option>";}}?>
                         </select>
                         </div>
                     </div>
+                    
                     <div class="form-group">
                         <label>Notes</label>
                         <textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"><?php echo $account_notes; ?></textarea>
                     </div>
+                
                 </div>
                 <div class="modal-footer bg-white">
                     <button type="submit" name="edit_account" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
diff --git a/accounts.php b/accounts.php
index 79edd340..9e06a5a5 100644
--- a/accounts.php
+++ b/accounts.php
@@ -12,7 +12,8 @@ $url_query_strings_sort = http_build_query($get_copy);
 $sql = mysqli_query(
     $mysqli,
     "SELECT SQL_CALC_FOUND_ROWS * FROM accounts
-    WHERE account_name LIKE '%$q%'
+    LEFT JOIN account_types ON account_types.account_type_id = accounts.account_type 
+    WHERE (account_name LIKE '%$q%' OR account_type_name LIKE '%$q%')
     AND account_archived_at IS NULL
     ORDER BY $sort $order LIMIT $record_from, $record_to"
 );
@@ -43,7 +44,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
                     <tr>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=account_name&order=<?php echo $disp; ?>">Name</a></th>
-                        <th class="text-center">Type</th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=account_type_name&order=<?php echo $disp; ?>">Type</a></th>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=account_currency_code&order=<?php echo $disp; ?>">Currency</a></th>
                         <th class="text-right">Balance</th>
                         <th class="text-center">Action</th>
@@ -58,10 +59,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $opening_balance = floatval($row['opening_balance']);
                         $account_currency_code = nullable_htmlentities($row['account_currency_code']);
                         $account_notes = nullable_htmlentities($row['account_notes']);
-                        $account_type_id = intval($row['account_type']);
-
-                        //Find account type name
-                        $account_type = mysqli_query($mysqli, "SELECT * FROM account_types WHERE account_type_id = $account_type_id");
+                        $account_type = intval($row['account_type']);
+                        $account_type_name = nullable_htmlentities($row['account_type_name']);
 
                         $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);
@@ -80,8 +79,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <tr>
                             <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editAccountModal<?php echo $account_id; ?>"><?php echo $account_name; ?></a></td>
-                            <td class="text-center"> <?php echo nullable_htmlentities(mysqli_fetch_array($account_type)['account_type_name']); ?>
-                            </td>
+                            <td><?php echo $account_type_name; ?></td>
                             <td><?php echo $account_currency_code; ?></td>
                             <td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, $account_currency_code); ?></td>
                             <td>