diff --git a/invoice_add_modal.php b/invoice_add_modal.php
index 7dd365c8..e1171764 100644
--- a/invoice_add_modal.php
+++ b/invoice_add_modal.php
@@ -34,8 +34,8 @@
                                 <select class="form-control select2" name="client" required>
                                     <option value="">- Client -</option>
                                     <?php
-
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients ORDER BY client_name ASC");
+                                    //select unarchived clients
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $client_id = intval($row['client_id']);
                                         $client_name = nullable_htmlentities($row['client_name']);
diff --git a/quote_add_modal.php b/quote_add_modal.php
index e5474106..08e232b6 100644
--- a/quote_add_modal.php
+++ b/quote_add_modal.php
@@ -35,7 +35,8 @@
                                     <option value="">- Client -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients ORDER BY client_name ASC");
+                                    //select unarchived clients
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $client_id = intval($row['client_id']);
                                         $client_name = nullable_htmlentities($row['client_name']);
diff --git a/recurring_invoice_add_modal.php b/recurring_invoice_add_modal.php
index 1e8ec876..324d8dd1 100644
--- a/recurring_invoice_add_modal.php
+++ b/recurring_invoice_add_modal.php
@@ -1,114 +1,114 @@
 <div class="modal" id="addRecurringModal" 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-redo-alt mr-2"></i>New Recurring Invoice</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-
-        <div class="modal-body bg-white">
-
-          <div class="form-group">
-            <label>Scope</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
-              </div>
-              <input type="text" class="form-control" name="scope" placeholder="Quick description">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-redo-alt mr-2"></i>New Recurring Invoice</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-          
-          <?php if (isset($_GET['client_id'])) { ?>
-          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-          <?php }else{ ?>
+            <form action="post.php" method="post" autocomplete="off">
 
-          <div class="form-group">
-            <label>Client <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-user"></i></span>
-              </div>
-              <select class="form-control select2" name="client" required>
-                <option value="">- Client -</option>
-                <?php 
-                
-                $sql = mysqli_query($mysqli, "SELECT * FROM clients ORDER BY client_name ASC"); 
-                while ($row = mysqli_fetch_array($sql)) {
-                  $client_id = intval($row['client_id']);
-                  $client_name = nullable_htmlentities($row['client_name']);
-                ?>
-                  <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
+                <div class="modal-body bg-white">
 
-          <?php } ?>
-         
-          <div class="form-group">
-            <label>Start 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="start_date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Frequency <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-clock"></i></span>
-              </div>
-              <select class="form-control select2" name="frequency" required>
-                <option value="">- Frequency -</option>
-                <option value="week">Weekly</option>
-                <option value="month">Monthly</option>
-                <option value="year">Yearly</option>
-              </select>
-            </div>
-          </div>
-           
-          <div class="form-group">
-            <label>Category <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-tag"></i></span>
-              </div>
-              <select class="form-control select2" name="category" required>
-                <option value="">- Category -</option>
-                <?php 
-                
-                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' 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 = nullable_htmlentities($row['category_name']);
-                ?>
-                <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-              <div class="input-group-append">
-                <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
-              </div>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Scope</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="scope" placeholder="Quick description">
+                        </div>
+                    </div>
 
+                    <?php if (isset($_GET['client_id'])) { ?>
+                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                    <?php } else { ?>
+
+                        <div class="form-group">
+                            <label>Client <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-user"></i></span>
+                                </div>
+                                <select class="form-control select2" name="client" required>
+                                    <option value="">- Client -</option>
+                                    <?php
+                                    //select unarchived clients
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
+                                    while ($row = mysqli_fetch_array($sql)) {
+                                        $client_id = intval($row['client_id']);
+                                        $client_name = nullable_htmlentities($row['client_name']);
+                                    ?>
+                                        <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
+
+                                    <?php
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                    <?php } ?>
+
+                    <div class="form-group">
+                        <label>Start 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="start_date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Frequency <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-clock"></i></span>
+                            </div>
+                            <select class="form-control select2" name="frequency" required>
+                                <option value="">- Frequency -</option>
+                                <option value="week">Weekly</option>
+                                <option value="month">Monthly</option>
+                                <option value="year">Yearly</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Category <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-tag"></i></span>
+                            </div>
+                            <select class="form-control select2" name="category" required>
+                                <option value="">- Category -</option>
+                                <?php
+
+                                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' 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 = nullable_htmlentities($row['category_name']);
+                                ?>
+                                    <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+
+                                <?php
+                                }
+                                ?>
+                            </select>
+                            <div class="input-group-append">
+                                <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="add_recurring" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</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 class="modal-footer bg-white">
-          <button type="submit" name="add_recurring" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</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>
\ No newline at end of file