diff --git a/client_overview.php b/client_overview.php
index 129a8447..13b8c32e 100644
--- a/client_overview.php
+++ b/client_overview.php
@@ -38,6 +38,7 @@ $sql_recent_logins = mysqli_query(
     $mysqli,
     "SELECT * FROM logins
      WHERE login_client_id = $client_id
+     AND login_archived_at IS NULL
      ORDER BY login_updated_at ASC
      LIMIT 5"
 );
@@ -63,6 +64,7 @@ $sql_stale_tickets = mysqli_query(
     "SELECT * FROM tickets
     WHERE ticket_client_id = $client_id
         AND ticket_updated_at < CURRENT_DATE - INTERVAL 3 DAY
+        AND ticket_resolved_At IS NULL
         AND ticket_closed_at IS NULL
     ORDER BY ticket_updated_at ASC 
     LIMIT 5"
diff --git a/recurring_expense_edit_modal.php b/recurring_expense_edit_modal.php
index 112b10e0..347e0fc1 100644
--- a/recurring_expense_edit_modal.php
+++ b/recurring_expense_edit_modal.php
@@ -34,18 +34,18 @@
                                 </div>
                                 <select class="form-control select2" name="month" required>
                                     <option value="">- Select a Month -</option>
-                                    <option value="1" <?php if($recurring_expense_month == 1) { echo "selected"; } ?>>01 - January</option>
-                                    <option value="2" <?php if($recurring_expense_month == 2) { echo "selected"; } ?>>02 - February</option>
-                                    <option value="3" <?php if($recurring_expense_month == 3) { echo "selected"; } ?>>03 - March</option>
-                                    <option value="4" <?php if($recurring_expense_month == 4) { echo "selected"; } ?>>04 - April</option>
-                                    <option value="5" <?php if($recurring_expense_month == 5) { echo "selected"; } ?>>05 - May</option>
-                                    <option value="6" <?php if($recurring_expense_month == 6) { echo "selected"; } ?>>06 - June</option>
-                                    <option value="7" <?php if($recurring_expense_month == 7) { echo "selected"; } ?>>07 - July</option>
-                                    <option value="8" <?php if($recurring_expense_month == 8) { echo "selected"; } ?>>08 - August</option>
-                                    <option value="9" <?php if($recurring_expense_month == 9) { echo "selected"; } ?>>09 - September</option>
-                                    <option value="10" <?php if($recurring_expense_month == 10) { echo "selected"; } ?>>10 - October</option>
-                                    <option value="11" <?php if($recurring_expense_month == 11) { echo "selected"; } ?>>11 - November</option>
-                                    <option value="12" <?php if($recurring_expense_month == 12) { echo "selected"; } ?>>12 - December</option>
+                                    <option value="1" <?php if($recurring_expense_next_month == 1) { echo "selected"; } ?>>01 - January</option>
+                                    <option value="2" <?php if($recurring_expense_next_month == 2) { echo "selected"; } ?>>02 - February</option>
+                                    <option value="3" <?php if($recurring_expense_next_month == 3) { echo "selected"; } ?>>03 - March</option>
+                                    <option value="4" <?php if($recurring_expense_next_month == 4) { echo "selected"; } ?>>04 - April</option>
+                                    <option value="5" <?php if($recurring_expense_next_month == 5) { echo "selected"; } ?>>05 - May</option>
+                                    <option value="6" <?php if($recurring_expense_next_month == 6) { echo "selected"; } ?>>06 - June</option>
+                                    <option value="7" <?php if($recurring_expense_next_month == 7) { echo "selected"; } ?>>07 - July</option>
+                                    <option value="8" <?php if($recurring_expense_next_month == 8) { echo "selected"; } ?>>08 - August</option>
+                                    <option value="9" <?php if($recurring_expense_next_month == 9) { echo "selected"; } ?>>09 - September</option>
+                                    <option value="10" <?php if($recurring_expense_next_month == 10) { echo "selected"; } ?>>10 - October</option>
+                                    <option value="11" <?php if($recurring_expense_next_month == 11) { echo "selected"; } ?>>11 - November</option>
+                                    <option value="12" <?php if($recurring_expense_next_month == 12) { echo "selected"; } ?>>12 - December</option>
                                 </select>
                             </div>
                         </div>
diff --git a/recurring_expenses.php b/recurring_expenses.php
index c2596b4c..ca2a3d4b 100644
--- a/recurring_expenses.php
+++ b/recurring_expenses.php
@@ -157,6 +157,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $recurring_expense_last_sent_display = $recurring_expense_last_sent;
                         }
                         $recurring_expense_next_date = nullable_htmlentities($row['recurring_expense_next_date']);
+                        $recurring_expense_next_month = date('n', strtotime($row['recurring_expense_next_date']));
                         $recurring_expense_status = intval($row['recurring_expense_status']);
                         $recurring_expense_description = nullable_htmlentities($row['recurring_expense_description']);
                         $recurring_expense_amount = floatval($row['recurring_expense_amount']);