diff --git a/client/includes/header.php b/client/includes/header.php
index f06abcdc..06a53e4c 100644
--- a/client/includes/header.php
+++ b/client/includes/header.php
@@ -56,6 +56,7 @@ header("X-Frame-Options: DENY"); // Legacy
                         </a>
                         <div class="dropdown-menu" aria-labelledby="navbarDropdown1">
                             <a class="dropdown-item" href="invoices.php">Invoices</a>
+                            <a class="dropdown-item" href="recurring_invoices.php">Recurring Invoices</a>
                             <a class="dropdown-item" href="quotes.php">Quotes</a>
                             <a class="dropdown-item" href="autopay.php">Auto Payment</a>
                         </div>
diff --git a/client/post.php b/client/post.php
index dba52e48..1f07af2c 100644
--- a/client/post.php
+++ b/client/post.php
@@ -678,10 +678,64 @@ if (isset($_GET['stripe_remove_pm'])) {
 
     // Remove payment method from ITFlow
     mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = NULL WHERE client_id = $session_client_id LIMIT 1");
+
+    // Remove Auto Pay on recurring invoices that are stripe
+    $sql_recurring_invoices = mysqli_query($mysqli, "SELECT recurring_invoice_id FROM recurring_invoices WHERE recurring_invoice_client_id = $session_client_id");
+
+    while ($row = mysqli_fetch_array($sql_recurring_invoices)) {
+        $recurring_invoice_id = intval($row['recurring_invoice_id']);
+        mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe' AND recurring_payment_recurring_invoice_id = $recurring_invoice_id");
+    }
     
     // Logging & Redirect
     logAction("Stripe", "Update", "$session_contact_name deleted saved Stripe payment method (PM: $payment_method)", $session_client_id, $session_client_id);
 
     $_SESSION['alert_message'] = "Payment method removed";
     header('Location: autopay.php');
+}
+
+if (isset($_POST['add_recurring_payment'])) {
+
+    $recurring_invoice_id = intval($_POST['recurring_invoice_id']);
+
+    // Get Recurring Info for logging and alerting
+    $sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id");
+    $row = mysqli_fetch_array($sql);
+    $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']);
+    $recurring_invoice_number = intval($row['recurring_invoice_number']);
+    $recurring_invoice_amount = floatval($row['recurring_invoice_amount']);
+    $recurring_invoice_currency_code = sanitizeInput($row['recurring_invoice_currency_code']);
+
+    mysqli_query($mysqli,"INSERT INTO recurring_payments SET recurring_payment_currency_code = '$recurring_invoice_currency_code', recurring_payment_account_id = $config_stripe_account, recurring_payment_method = 'Stripe', recurring_payment_recurring_invoice_id = $recurring_invoice_id");
+
+    // Get Payment ID for reference
+    $recurring_payment_id = mysqli_insert_id($mysqli);
+
+    // Logging
+    logAction("Recurring Invoice", "Auto Payment", "$session_name created Auto Pay for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number in the amount of " . numfmt_format_currency($currency_format, $recurring_invoice_amount, $recurring_invoice_currency_code), $session_client_id, $recurring_invoice_id);
+
+
+    $_SESSION['alert_message'] = "Automatic Payment enabled for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+}
+
+if (isset($_POST['delete_recurring_payment'])) {
+    $recurring_invoice_id = intval($_POST['recurring_invoice_id']);
+
+    // Get the invoice total and details
+    $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id");
+    $row = mysqli_fetch_array($sql);
+    $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']);
+    $recurring_invoice_number = intval($row['recurring_invoice_number']);
+
+    mysqli_query($mysqli,"DELETE FROM recurring_payments WHERE recurring_payment_recurring_invoice_id = $recurring_invoice_id");
+
+    // Logging
+    logAction("Recurring Invoice", "Auto Payment", "$session_name removed auto Pay from Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number", $session_client_id, $recurring_invoice_id);
+
+    $_SESSION['alert_message'] = "Automatic Payment disabled for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
 }
\ No newline at end of file
diff --git a/client/recurring_invoices.php b/client/recurring_invoices.php
new file mode 100644
index 00000000..6f0c15c1
--- /dev/null
+++ b/client/recurring_invoices.php
@@ -0,0 +1,120 @@
+<?php
+/*
+ * Client Portal
+ * Invoices for PTC
+ */
+
+header("Content-Security-Policy: default-src 'self'");
+
+require_once "includes/inc_all.php";
+
+
+if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) {
+    header("Location: post.php?logout");
+    exit();
+}
+
+// Get client's StripeID from database
+$stripe_client_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM client_stripe WHERE client_id = $session_client_id LIMIT 1"));
+if ($stripe_client_details) {
+    $stripe_pm = sanitizeInput($stripe_client_details['stripe_pm']);
+}
+
+$recurring_invoices_sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoices 
+    LEFT JOIN recurring_payments ON recurring_payment_recurring_invoice_id = recurring_invoice_id
+    WHERE recurring_invoice_client_id = $session_client_id
+    AND recurring_invoice_status = 1
+    ORDER BY recurring_invoice_next_date DESC"
+);
+
+?>
+
+<h3>Recurring Invoices</h3>
+<div class="row">
+
+    <div class="col-md-10">
+
+        <table class="table tabled-bordered border border-dark">
+            <thead class="thead-dark">
+            <tr>
+                <th>Scope</th>
+                <th>Amount</th>
+                <th>Next Bill Date</th>
+                <th>Frequency</th>
+                <?php if ($config_stripe_enable) { ?>
+                <th>Auto Pay</th>
+                <?php } ?>
+            </tr>
+            </thead>
+            <tbody>
+
+            <?php
+            while ($row = mysqli_fetch_array($recurring_invoices_sql)) {
+                $recurring_invoice_id = intval($row['recurring_invoice_id']);
+                $recurring_invoice_prefix = nullable_htmlentities($row['recurring_invoice_prefix']);
+                $recurring_invoice_number = intval($row['recurring_invoice_number']);
+                $recurring_invoice_scope = nullable_htmlentities($row['recurring_invoice_scope']);
+                $recurring_invoice_status = nullable_htmlentities($row['recurring_invoice_status']);
+                $recurring_invoice_next_date = nullable_htmlentities($row['recurring_invoice_next_date']);
+                $recurring_invoice_frequency = nullable_htmlentities($row['recurring_invoice_frequency']);
+                $recurring_invoice_amount = floatval($row['recurring_invoice_amount']);
+                $recurring_payment_id = intval($row['recurring_payment_id']);
+                $recurring_payment_recurring_invoice_id = intval($row['recurring_payment_recurring_invoice_id']);
+                if ($config_stripe_enable) {
+                    if ($recurring_payment_recurring_invoice_id) {
+                        $auto_pay_display = "
+                            Yes
+                            <a href='post.php?delete_recurring_payment=$recurring_payment_id' title='Remove'>
+                                <i class='fas fa-fw fa-times-circle'></i>
+                            </a>
+                        ";
+                    } else {
+                        $auto_pay_display = "
+                            <a href='#' data-toggle='modal' data-target='#addRecurringPaymentModal$recurring_invoice_id'>
+                                Create
+                            </a>
+                        ";
+                        //require "recurring_payment_add_modal.php";
+                    }
+                }
+                
+                if (empty($recurring_invoice_scope)) {
+                    $recurring_invoice_scope_display = "-";
+                } else {
+                    $recurring_invoice_scope_display = $recurring_invoice_scope;
+                }
+                ?>
+
+                <tr>
+                    <td><?php echo $recurring_invoice_scope_display; ?></td>
+                    <td><?php echo numfmt_format_currency($currency_format, $recurring_invoice_amount, $session_company_currency); ?></td>
+                    <td><?php echo $recurring_invoice_next_date; ?></td>
+                    <td><?php echo ucwords($recurring_invoice_frequency); ?>ly</td>
+                    <?php if ($config_stripe_enable) { ?>
+                    <td>
+                        <?php if ($stripe_pm) { ?>
+                            <form class="form" action="post.php" method="post">
+                                <input type="hidden" name="recurring_invoice_id" value="<?php echo $recurring_invoice_id; ?>">
+                                <?php if ($recurring_payment_recurring_invoice_id) { ?>
+                                <button type="submit" name="delete_recurring_payment" class="btn btn-outline-dark"><i class="fas fa-times mr-2"></i>Disable</button>
+                                <?php } else { ?>
+                                <button type="submit" name="add_recurring_payment" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Enable</button>
+                                <?php } ?>
+                            </form>
+                        <?php } else { ?>
+                            <a href="autopay.php">Add Card Details First</a>
+                        <?php } ?>
+                    </td>
+                    <?php } ?>
+                </tr>
+            <?php } ?>
+
+            </tbody>
+        </table>
+
+    </div>
+
+</div>
+
+<?php
+require_once "includes/footer.php";
diff --git a/post/admin/admin_settings_online_payment_clients.php b/post/admin/admin_settings_online_payment_clients.php
index 656466db..6aa256b7 100644
--- a/post/admin/admin_settings_online_payment_clients.php
+++ b/post/admin/admin_settings_online_payment_clients.php
@@ -31,6 +31,14 @@ if (isset($_GET['stripe_remove_pm'])) {
     // Remove payment method from ITFlow
     mysqli_query($mysqli, "UPDATE client_stripe SET stripe_pm = NULL WHERE client_id = $client_id LIMIT 1");
 
+    // Remove Auto Pay on recurring invoices that are stripe
+    $sql_recurring_invoices = mysqli_query($mysqli, "SELECT recurring_invoice_id FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id");
+
+    while ($row = mysqli_fetch_array($sql_recurring_invoices)) {
+        $recurring_invoice_id = intval($row['recurring_invoice_id']);
+        mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe' AND recurring_payment_recurring_invoice_id = $recurring_invoice_id");
+    }
+
     // Logging & Redirect
     logAction("Stripe", "Update", "$session_name deleted saved Stripe payment method (PM: $payment_method)", $client_id);
     $_SESSION['alert_message'] = "Payment method removed";
@@ -46,6 +54,14 @@ if (isset($_GET['stripe_reset_customer'])) {
     // Delete the customer id and payment method id stored in ITFlow, allowing the client to set these up again
     mysqli_query($mysqli, "DELETE FROM client_stripe WHERE client_id = $client_id");
 
+    // Remove Auto Pay on recurring invoices that are stripe
+    $sql_recurring_invoices = mysqli_query($mysqli, "SELECT recurring_invoice_id FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id");
+
+    while ($row = mysqli_fetch_array($sql_recurring_invoices)) {
+        $recurring_invoice_id = intval($row['recurring_invoice_id']);
+        mysqli_query($mysqli, "DELETE FROM recurring_payments WHERE recurring_payment_method = 'Stripe' AND recurring_payment_recurring_invoice_id = $recurring_invoice_id");
+    }
+
     // Logging
     logAction("Stripe", "Delete", "$session_name reset Stripe settings for client", $client_id);