diff --git a/agent/modals/recurring_ticket/recurring_ticket_add.php b/agent/modals/recurring_ticket/recurring_ticket_add.php
index 82e44fd3..add2628c 100644
--- a/agent/modals/recurring_ticket/recurring_ticket_add.php
+++ b/agent/modals/recurring_ticket/recurring_ticket_add.php
@@ -18,7 +18,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <?php if (isset($client_id)) { ?>
-           <input type="hidden" name="client" value="<?php echo $client_id; ?>>">
+           <input type="hidden" name="client_id" value="<?php echo $client_id; ?>>">
     <?php } ?>
     <input type="hidden" name="billable" value="0">
 
@@ -84,7 +84,7 @@ ob_start();
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
                                 </div>
-                                <select class="form-control select2" name="category">
+                                <select class="form-control select2" name="category_id">
                                     <option value="0">- Not Categorized -</option>
                                     <?php
                                     $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
@@ -145,8 +145,8 @@ ob_start();
             </div>
 
             <?php if ($contact_id) { ?>
-                <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-                <input type="hidden" name="contact" value="<?php echo $contact_id; ?>">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
             <?php } else { ?>
             <div class="tab-pane fade" id="pills-add-contacts">
 
@@ -156,7 +156,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                         </div>
-                        <select class="form-control select2" name="client" id="changeClientSelect" required <?php if ($client_id) { echo "disabled"; } ?>>
+                        <select class="form-control select2" name="client_id" id="changeClientSelect" required <?php if ($client_id) { echo "disabled"; } ?>>
                             <option value="">- Client -</option>
                             <?php
 
@@ -179,7 +179,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                         </div>
-                        <select class="form-control select2" name="contact" id="contactSelect">
+                        <select class="form-control select2" name="contact_id" id="contactSelect">
                         </select>
                     </div>
                 </div>
@@ -237,7 +237,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
                             </div>
-                            <select class="form-control select2" name="asset">
+                            <select class="form-control select2" name="asset_id">
                                 <option value="0">- None -</option>
 
                                 <?php
diff --git a/agent/modals/recurring_ticket/recurring_ticket_edit.php b/agent/modals/recurring_ticket/recurring_ticket_edit.php
index bec27c24..90a266ec 100644
--- a/agent/modals/recurring_ticket/recurring_ticket_edit.php
+++ b/agent/modals/recurring_ticket/recurring_ticket_edit.php
@@ -40,28 +40,28 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="recurring_ticket_id" value="<?php echo $recurring_ticket_id; ?>">
-    <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
     <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
-                <a class="nav-link active" data-toggle="pill" href="#pills-edit-details<?php echo $recurring_ticket_id; ?>"><i class="fa fa-fw fa-life-ring mr-2"></i>Details</a>
+                <a class="nav-link active" data-toggle="pill" href="#pills-edit-details"><i class="fa fa-fw fa-life-ring mr-2"></i>Details</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-edit-contacts<?php echo $recurring_ticket_id; ?>"><i class="fa fa-fw fa-users mr-2"></i>Contact</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-edit-contacts"><i class="fa fa-fw fa-users mr-2"></i>Contact</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-edit-schedule<?php echo $recurring_ticket_id; ?>"><i class="fa fa-fw fa-building mr-2"></i>Schedule</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-edit-schedule"><i class="fa fa-fw fa-building mr-2"></i>Schedule</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-edit-assets<?php echo $recurring_ticket_id; ?>"><i class="fa fa-fw fa-desktop mr-2"></i>Assets</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-edit-assets"><i class="fa fa-fw fa-desktop mr-2"></i>Assets</a>
             </li>
         </ul>
 
         <div class="tab-content" <?php if (lookupUserPermission('module_support') <= 1) { echo 'inert'; } ?>>
 
-            <div class="tab-pane fade show active" id="pills-edit-details<?php echo $recurring_ticket_id; ?>">
+            <div class="tab-pane fade show active" id="pills-edit-details">
 
                 <div class="form-group">
                     <label>Subject <strong class="text-danger">*</strong></label>
@@ -101,7 +101,7 @@ ob_start();
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
                                 </div>
-                                <select class="form-control select2" name="category">
+                                <select class="form-control select2" name="category_id">
                                     <option value="0">- Uncategorized -</option>
                                     <?php
                                     $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
@@ -161,7 +161,7 @@ ob_start();
 
             </div>
 
-            <div class="tab-pane fade" id="pills-edit-contacts<?php echo $recurring_ticket_id; ?>">
+            <div class="tab-pane fade" id="pills-edit-contacts">
 
                 <div class="form-group">
                     <label>Contact</label>
@@ -169,7 +169,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                         </div>
-                        <select class="form-control select2" name="contact">
+                        <select class="form-control select2" name="contact_id">
                             <option value="0">- Select Contact -</option>
                             <?php
                             $sql_client_contacts_select = mysqli_query($mysqli, "SELECT contact_id, contact_name, contact_title, contact_primary, contact_technical FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL ORDER BY contact_primary DESC, contact_technical DESC, contact_name ASC");
@@ -204,7 +204,7 @@ ob_start();
 
             </div>
 
-            <div class="tab-pane fade" id="pills-edit-schedule<?php echo $recurring_ticket_id; ?>">
+            <div class="tab-pane fade" id="pills-edit-schedule">
 
                 <div class="form-group">
                     <label>Frequency <strong class="text-danger">*</strong></label>
@@ -236,7 +236,7 @@ ob_start();
 
             </div>
 
-            <div class="tab-pane fade" id="pills-edit-assets<?php echo $recurring_ticket_id; ?>">
+            <div class="tab-pane fade" id="pills-edit-assets">
 
                 <div class="form-group">
                     <label>Asset</label>
@@ -244,7 +244,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
                         </div>
-                        <select class="form-control select2" name="asset">
+                        <select class="form-control select2" name="asset_id">
                             <option value="0">- Select Asset -</option>
                             <?php
 
diff --git a/agent/post/recurring_ticket.php b/agent/post/recurring_ticket.php
index baeb745a..94578958 100644
--- a/agent/post/recurring_ticket.php
+++ b/agent/post/recurring_ticket.php
@@ -14,11 +14,13 @@ if (isset($_POST['add_recurring_ticket'])) {
 
     require_once 'ticket_recurring_model.php';
 
+    $client_id = intval($_POST['client_id']);
+
     enforceClientAccess();
 
     $start_date = sanitizeInput($_POST['start_date']);
 
-    mysqli_query($mysqli, "INSERT INTO recurring_tickets SET recurring_ticket_subject = '$subject', recurring_ticket_details = '$details', recurring_ticket_priority = '$priority', recurring_ticket_frequency = '$frequency', recurring_ticket_billable = $billable, recurring_ticket_start_date = '$start_date', recurring_ticket_next_run = '$start_date', recurring_ticket_assigned_to = $assigned_to, recurring_ticket_created_by = $session_user_id, recurring_ticket_client_id = $client_id, recurring_ticket_contact_id = $contact_id, recurring_ticket_asset_id = $asset_id, recurring_ticket_category = $category");
+    mysqli_query($mysqli, "INSERT INTO recurring_tickets SET recurring_ticket_subject = '$subject', recurring_ticket_details = '$details', recurring_ticket_priority = '$priority', recurring_ticket_frequency = '$frequency', recurring_ticket_billable = $billable, recurring_ticket_start_date = '$start_date', recurring_ticket_next_run = '$start_date', recurring_ticket_assigned_to = $assigned_to, recurring_ticket_created_by = $session_user_id, recurring_ticket_client_id = $client_id, recurring_ticket_contact_id = $contact_id, recurring_ticket_asset_id = $asset_id, recurring_ticket_category = $category_id");
 
     $recurring_ticket_id = mysqli_insert_id($mysqli);
 
@@ -46,11 +48,13 @@ if (isset($_POST['edit_recurring_ticket'])) {
 
     require_once 'ticket_recurring_model.php';
 
-    enforceClientAccess();
-
     $recurring_ticket_id = intval($_POST['recurring_ticket_id']);
     $next_run_date = sanitizeInput($_POST['next_date']);
 
+    $client_id = intval(getFieldById('recurring_tickets', $recurring_ticket_id, 'recurring_ticket_client_id'));
+
+    enforceClientAccess();
+
     mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_subject = '$subject', recurring_ticket_details = '$details', recurring_ticket_priority = '$priority', recurring_ticket_frequency = '$frequency', recurring_ticket_billable = $billable, recurring_ticket_next_run = '$next_run_date', recurring_ticket_assigned_to = $assigned_to, recurring_ticket_asset_id = $asset_id, recurring_ticket_contact_id = $contact_id, recurring_ticket_category = $category WHERE recurring_ticket_id = $recurring_ticket_id");
 
     // Add Additional Assets
diff --git a/agent/post/ticket_recurring_model.php b/agent/post/recurring_ticket_model.php
similarity index 69%
rename from agent/post/ticket_recurring_model.php
rename to agent/post/recurring_ticket_model.php
index eae9e116..a44c2fa6 100644
--- a/agent/post/ticket_recurring_model.php
+++ b/agent/post/recurring_ticket_model.php
@@ -1,13 +1,12 @@
 <?php
 defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
 
-$client_id = intval($_POST['client']);
 $subject = sanitizeInput($_POST['subject']);
 $priority = sanitizeInput($_POST['priority']);
 $details = mysqli_real_escape_string($mysqli, $_POST['details']);
 $frequency = sanitizeInput($_POST['frequency']);
 $billable = intval($_POST['billable'] ?? 0);
-$asset_id = intval($_POST['asset'] ?? 0);
-$contact_id = intval($_POST['contact'] ?? 0);
+$asset_id = intval($_POST['asset_id'] ?? 0);
+$contact_id = intval($_POST['contact_id'] ?? 0);
 $assigned_to = intval($_POST['assigned_to'] ?? 0);
-$category = intval($_POST['category'] ?? 0); 
\ No newline at end of file
+$category_id = intval($_POST['category_id'] ?? 0);