diff --git a/add_invoice_recurring_modal.php b/add_invoice_recurring_modal.php
new file mode 100644
index 00000000..3983ece7
--- /dev/null
+++ b/add_invoice_recurring_modal.php
@@ -0,0 +1,37 @@
+<div class="modal" id="addInvoiceRecurringModal<?php echo $invoice_id; ?>" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-copy mr-2"></i>Make <?php echo "$invoice_prefix$invoice_number"; ?> Recurring</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>"> 
+        <div class="modal-body bg-white">
+          
+          <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>
+        <div class="modal-footer bg-white">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_invoice_recurring" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/post.php b/post.php
index 8bb354b6..230a426c 100644
--- a/post.php
+++ b/post.php
@@ -1791,12 +1791,18 @@ if(isset($_POST['add_invoice_recurring'])){
     $row = mysqli_fetch_array($sql);
     $invoice_date = $row['invoice_date'];
     $invoice_amount = $row['invoice_amount'];
+    $invoice_currency_code = $row['invoice_currency_code'];
     $invoice_scope = mysqli_real_escape_string($mysqli,$row['invoice_scope']);
     $invoice_note = mysqli_real_escape_string($mysqli,$row['invoice_note']); //SQL Escape in case notes have , them
     $client_id = $row['client_id'];
     $category_id = $row['category_id'];
 
-    mysqli_query($mysqli,"INSERT INTO recurring SET recurring_scope = '$invoice_scope', recurring_frequency = '$recurring_frequency', recurring_next_date = DATE_ADD('$invoice_date', INTERVAL 1 $recurring_frequency), recurring_status = 1, recurring_amount = '$invoice_amount', recurring_note = '$invoice_note', recurring_created_at = NOW(), category_id = $category_id, client_id = $client_id, company_id = $session_company_id");
+    //Get the last Recurring Number and add 1 for the new Recurring number
+    $recurring_number = $config_recurring_next_number;
+    $new_config_recurring_next_number = $config_recurring_next_number + 1;
+    mysqli_query($mysqli,"UPDATE settings SET config_recurring_next_number = $new_config_recurring_next_number WHERE company_id = $session_company_id");
+
+    mysqli_query($mysqli,"INSERT INTO recurring SET recurring_prefix = '$config_recurring_prefix', recurring_number = $recurring_number, recurring_scope = '$invoice_scope', recurring_frequency = '$recurring_frequency', recurring_next_date = DATE_ADD('$invoice_date', INTERVAL 1 $recurring_frequency), recurring_status = 1, recurring_amount = '$invoice_amount', recurring_currency_code = '$invoice_currency_code', recurring_note = '$invoice_note', recurring_created_at = NOW(), category_id = $category_id, client_id = $client_id, company_id = $session_company_id");
 
     $recurring_id = mysqli_insert_id($mysqli);