diff --git a/add_payment_modal.php b/add_payment_modal.php
index 2be8b774..ecad5eb8 100644
--- a/add_payment_modal.php
+++ b/add_payment_modal.php
@@ -27,7 +27,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-dollar-sign"></i></span>
                 </div>
-                <input type="number" class="form-control" step="0.01" min="0.00" name="amount" value="<?php echo number_format($balance,2); ?>" required>
+                <input type="number" class="form-control" step="0.01" min="0.00" name="amount" value="<?php echo $balance; ?>" required>
               </div>
             </div>
           </div>
diff --git a/add_recurring_invoice_modal.php b/add_recurring_invoice_modal.php
index f18510ed..9520bbf0 100644
--- a/add_recurring_invoice_modal.php
+++ b/add_recurring_invoice_modal.php
@@ -50,7 +50,6 @@
                 </div>
                 <select class="form-control" name="frequency" required>
                   <option value="">- frequency -</option>
-                  <option value="day">Daily</option>
                   <option value="week">Weekly</option>
                   <option value="month">Monthly</option>
                   <option value="year">Yearly</option>
diff --git a/client.php b/client.php
index 0b15a660..4f7480b8 100644
--- a/client.php
+++ b/client.php
@@ -150,6 +150,7 @@ if(isset($_GET['client_id'])){
 <?php include("add_client_application_modal.php"); ?>
 <?php include("add_client_note_modal.php"); ?>
 <?php include("add_client_invoice_modal.php"); ?>
+<?php include("add_recurring_invoice_modal.php"); ?>
 <?php include("add_invoice_payment_modal.php"); ?>
 <?php include("add_quote_modal.php"); ?>
 <?php include("add_client_attachment_modal.php"); ?>
diff --git a/client_invoices.php b/client_invoices.php
index c2d48478..f600d8ed 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -84,7 +84,7 @@
             <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
               <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editinvoiceModal<?php echo $invoice_id; ?>">Edit</a>
               <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addinvoiceCopyModal<?php echo $invoice_id; ?>">Copy</a>
-              <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addinvoiceCopyModal<?php echo $invoice_id; ?>">PDF</a>
+              <a class="dropdown-item" href="post.php?pdf_invoice=<?php echo $invoice_id; ?>">PDF</a>
               <a class="dropdown-item" href="post.php?delete_invoice=<?php echo $invoice_id; ?>">Delete</a>
             </div>
           </div>      
diff --git a/create_recurring_invoices.php b/create_recurring_invoices.php
index caf78492..2eb7d6f3 100644
--- a/create_recurring_invoices.php
+++ b/create_recurring_invoices.php
@@ -2,9 +2,9 @@
 
 <?php
 
-//Send Recurring Invoices
+//Send Recurring Invoices that match todays date and are active
 
-$sql_recurring_invoices = mysqli_query($mysqli,"SELECT * FROM recurring_invoices, clients, invoices WHERE clients.client_id = invoices.client_id AND invoices.invoice_id = recurring_invoices.invoice_id AND recurring_invoices.recurring_invoice_next_date = CURDATE()");
+$sql_recurring_invoices = mysqli_query($mysqli,"SELECT * FROM recurring_invoices, clients, invoices WHERE clients.client_id = invoices.client_id AND invoices.invoice_id = recurring_invoices.invoice_id AND recurring_invoices.recurring_invoice_next_date = CURDATE() AND recurring_invoices.recurring_invoice_status = 1");
 
 while($row = mysqli_fetch_array($sql_recurring_invoices)){
   $recurring_invoice_id = $row['recurring_invoice_id'];
@@ -20,13 +20,14 @@ while($row = mysqli_fetch_array($sql_recurring_invoices)){
   $invoice_category_id = $row['category_id'];
   $client_id = $row['client_id'];
   $client_name = $row['client_name'];
+  $client_net_terms = $row['client_net_terms'];
 
   //Get the last Invoice Number and add 1 for the new invoice number
   $sql_invoice_number = mysqli_query($mysqli,"SELECT invoice_number FROM invoices ORDER BY invoice_number DESC LIMIT 1");
   $row = mysqli_fetch_array($sql_invoice_number);
   $new_invoice_number = $row['invoice_number'] + 1;
 
-  mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = $new_invoice_number, invoice_date = CURDATE(), invoice_due = CURDATE(), invoice_amount = '$invoice_amount', invoice_note = '$invoice_note', category_id = $invoice_category_id, invoice_status = 'Sent', client_id = $client_id");
+  mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = $new_invoice_number, invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day) , invoice_amount = '$invoice_amount', invoice_note = '$invoice_note', category_id = $invoice_category_id, invoice_status = 'Sent', client_id = $client_id");
 
   $new_invoice_id = mysqli_insert_id($mysqli);
 
@@ -49,6 +50,7 @@ while($row = mysqli_fetch_array($sql_recurring_invoices)){
 
   mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Draft', invoice_history_description = 'INVOICE added!', invoice_id = $new_invoice_id");
 
+  //update the recurring invoice with the new dates
   mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_last_sent = CURDATE(), recurring_invoice_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_invoice_frequency) , invoice_id = $new_invoice_id WHERE recurring_invoice_id = $recurring_invoice_id");
 } 
 
diff --git a/invoice.php b/invoice.php
index 4ba93a8d..c441d970 100644
--- a/invoice.php
+++ b/invoice.php
@@ -87,6 +87,7 @@ if(isset($_GET['invoice_id'])){
         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceModal">Edit</a>
         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceNoteModal">Note</a>
         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addinvoiceCopyModal<?php echo $invoice_id; ?>">Copy</a>
+        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addinvoiceCopyModal<?php echo $invoice_id; ?>">Recurring</a>
         <a class="dropdown-item" href="post.php?email_invoice=<?php echo $invoice_id; ?>">Send Email</a>
         <?php if($invoice_status == "Draft"){ ?><a class="dropdown-item" href="post.php?mark_invoice_sent=<?php echo $invoice_id; ?>">Mark Sent</a><?php } ?>
         <?php if($invoice_status !== "Paid"){ ?><a class="dropdown-item" href="#" data-toggle="modal" data-target="#addPaymentModal">Add Payment</a><?php } ?>
diff --git a/invoices.php b/invoices.php
index 4a8ac137..b8a857f3 100644
--- a/invoices.php
+++ b/invoices.php
@@ -97,7 +97,7 @@
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editinvoiceModal<?php echo $invoice_id; ?>">Edit</a>
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addinvoiceCopyModal<?php echo $invoice_id; ?>">Copy</a>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addinvoiceCopyModal<?php echo $invoice_id; ?>">PDF</a>
+                  <a class="dropdown-item" href="post.php?pdf_invoice=<?php echo $invoice_id; ?>">PDF</a>
                   <a class="dropdown-item" href="post.php?delete_invoice=<?php echo $invoice_id; ?>">Delete</a>
                 </div>
               </div>      
diff --git a/post.php b/post.php
index 2b70dfe4..eea20313 100644
--- a/post.php
+++ b/post.php
@@ -514,7 +514,7 @@ if(isset($_POST['add_recurring_invoice'])){
 
     $invoice_id = mysqli_insert_id($mysqli);
 
-    mysqli_query($mysqli,"INSERT INTO recurring_invoices SET recurring_invoice_frequency = '$frequency', recurring_invoice_start_date = '$start_date', recurring_invoice_next_date = '$start_date', invoice_id = $invoice_id");
+    mysqli_query($mysqli,"INSERT INTO recurring_invoices SET recurring_invoice_frequency = '$frequency', recurring_invoice_start_date = '$start_date', recurring_invoice_next_date = '$start_date', recurring_invoice_status = 1, invoice_id = $invoice_id");
 
     $recurring_invoice_id = mysqli_insert_id($mysqli);
 
@@ -524,6 +524,29 @@ if(isset($_POST['add_recurring_invoice'])){
 
 }
 
+if(isset($_GET['recurring_activate'])){
+
+    $recurring_invoice_id = intval($_GET['recurring_activate']);
+
+    mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_status = 1 WHERE recurring_invoice_id = $recurring_invoice_id");
+
+    $_SESSION['alert_message'] = "Recurring Invoice Activated";
+    
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
+if(isset($_GET['recurring_deactivate'])){
+
+    $recurring_invoice_id = intval($_GET['recurring_deactivate']);
+
+    mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_status = 0 WHERE recurring_invoice_id = $recurring_invoice_id");
+
+    $_SESSION['alert_message'] = "Recurring Invoice Deactivated";
+    
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
 
 if(isset($_GET['mark_invoice_sent'])){
 
diff --git a/recurring.php b/recurring.php
index cfe17291..898f4759 100644
--- a/recurring.php
+++ b/recurring.php
@@ -40,16 +40,29 @@
             $client_id = $row['client_id'];
             $client_name = $row['client_name'];
             $invoice_id = $row['invoice_id'];
+            if($recurring_invoice_status == 1){
+              $status = "Active";
+              $status_badge_color = "success";
+            }else{
+              $status = "Inactive";
+              $status_badge_color = "secondary";
+            }
+
 
           ?>
 
           <tr>
-            <td><?php echo $recurring_invoice_frequency; ?></td>
+            <td><?php echo ucwords($recurring_invoice_frequency); ?>ly</td>
             <td><a href="client.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
             <td><?php echo $recurring_invoice_start_date; ?></td>
             <td><?php echo $recurring_invoice_last_sent; ?></td>
             <td><?php echo $recurring_invoice_next_date; ?></td>
-            <td><?php echo $recurring_invoice_status; ?></td>
+            <td>
+               <span class="p-2 badge badge-<?php echo $status_badge_color; ?>">
+                <?php echo $status; ?>
+              </span>
+                
+            </td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -57,8 +70,12 @@
                 </button>
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                   <a class="dropdown-item" href="recurring_invoice.php?recurring_invoice_id=<?php echo $recurring_invoice_id; ?>">Edit</a>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addinvoiceCopyModal<?php echo $invoice_id; ?>">Disable</a>
-                  <a class="dropdown-item" href="post.php?delete_invoice=<?php echo $invoice_id; ?>">Delete</a>
+                  <?php if($recurring_invoice_status == 1){ ?>
+                    <a class="dropdown-item" href="post.php?recurring_deactivate=<?php echo $recurring_invoice_id; ?>">Deactivate</a>
+                  <?php }else{ ?>
+                    <a class="dropdown-item" href="post.php?recurring_activate=<?php echo $recurring_invoice_id; ?>">Activate</a>
+                  <?php } ?>
+                    <a class="dropdown-item" href="post.php?delete_invoice=<?php echo $invoice_id; ?>">Delete</a>
                 </div>
               </div>      
             </td>
diff --git a/recurring_invoice.php b/recurring_invoice.php
index a4d99d20..c8cee6e1 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -36,6 +36,15 @@ if(isset($_GET['recurring_invoice_id'])){
     $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
   }
   $client_website = $row['client_website'];
+  if($recurring_invoice_status == 1){
+    $status = "Active";
+    $status_badge_color = "success";
+  }else{
+    $status = "Inactive";
+    $status_badge_color = "secondary";
+  }
+
+
 
   $sql_invoice_history = mysqli_query($mysqli,"SELECT * FROM invoice_history WHERE invoice_id = $invoice_id ORDER BY invoice_history_id ASC");
   
@@ -55,6 +64,7 @@ if(isset($_GET['recurring_invoice_id'])){
     <a href="recurring.php"> Recurring Invoices</a>
   </li>
   <li class="breadcrumb-item active"><?php echo $recurring_invoice_id; ?></li>
+  <span class="ml-3 p-2 badge badge-<?php echo $status_badge_color; ?>"><?php echo $status; ?></span>
 </ol>
 
 <div class="row mb-4 d-print-none">
@@ -66,7 +76,11 @@ if(isset($_GET['recurring_invoice_id'])){
       <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceModal">Edit</a>
         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceNoteModal">Note</a>
-        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addinvoiceCopyModal<?php echo $invoice_id; ?>">Disable</a>
+        <?php if($recurring_invoice_status == 1){ ?>
+          <a class="dropdown-item" href="post.php?recurring_deactivate=<?php echo $recurring_invoice_id; ?>">Deactivate</a>
+        <?php }else{ ?>
+          <a class="dropdown-item" href="post.php?recurring_activate=<?php echo $recurring_invoice_id; ?>">Activate</a>
+        <?php } ?>
         <a class="dropdown-item" href="#">Delete</a>
       </div>
     </div>