diff --git a/certificates.php b/certificates.php
index 0d80435f..7e7bfc04 100644
--- a/certificates.php
+++ b/certificates.php
@@ -194,9 +194,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         // Determine the class based on the number of days until expiry
                         if ($days_until_expiry <= 0) {
                             $tr_class = "table-secondary";
-                        } elseif ($days_until_expiry <= 14) {
+                        } elseif ($days_until_expiry <= 1) {
                             $tr_class = "table-danger";
-                        } elseif ($days_until_expiry <= 90) {
+                        } elseif ($days_until_expiry <= 7) {
                             $tr_class = "table-warning";
                         } else {
                             $tr_class = '';
diff --git a/includes/inc_all_client.php b/includes/inc_all_client.php
index 65ab7d2d..502c894e 100644
--- a/includes/inc_all_client.php
+++ b/includes/inc_all_client.php
@@ -248,13 +248,13 @@ if (isset($_GET['client_id'])) {
         ));
         $num_domains_urgent = intval($row['num']);
 
-        // Count Certificates Expiring within 45 Days
+        // Count Certificates Expiring within 7 Days
         $row = mysqli_fetch_assoc(mysqli_query(
             $mysqli,
             "SELECT COUNT('certificate_id') AS num FROM certificates
             WHERE certificate_client_id = $client_id
             AND certificate_expire IS NOT NULL
-            AND certificate_expire < CURRENT_DATE + INTERVAL 45 DAY
+            AND certificate_expire < CURRENT_DATE + INTERVAL 7 DAY
             AND certificate_archived_at IS NULL"
         ));
         $num_certificates_expiring = intval($row['num']);
@@ -267,7 +267,7 @@ if (isset($_GET['client_id'])) {
             AND certificate_expire IS NOT NULL
             AND (
                     certificate_expire < CURRENT_DATE
-                    OR certificate_expire < CURRENT_DATE + INTERVAL 7 DAY
+                    OR certificate_expire < CURRENT_DATE + INTERVAL 1 DAY
                 )
             AND certificate_archived_at IS NULL"
         ));