diff --git a/client_recurring.php b/client_recurring.php
index 7a34adbe..13fc69e4 100644
--- a/client_recurring.php
+++ b/client_recurring.php
@@ -146,12 +146,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                     <div class="dropdown-menu">
                       <a class="dropdown-item" href="recurring_invoice.php?recurring_id=<?php echo $recurring_id; ?>">Edit</a>
                       <div class="dropdown-divider"></div>
-                      <?php if($recurring_status == 1){ ?>
-                        <a class="dropdown-item" href="post.php?recurring_deactivate=<?php echo $recurring_id; ?>">Deactivate</a>
-                      <?php }else{ ?>
-                        <a class="dropdown-item" href="post.php?recurring_activate=<?php echo $recurring_id; ?>">Activate</a>
-                      <?php } ?>
-                      <div class="dropdown-divider"></div>
                       <a class="dropdown-item text-danger" href="post.php?delete_recurring=<?php echo $recurring_id; ?>">Delete</a>
                     </div>
                   </div>      
diff --git a/post.php b/post.php
index ad5f27fc..6418618c 100644
--- a/post.php
+++ b/post.php
@@ -2917,7 +2917,7 @@ if(isset($_POST['add_recurring'])){
 
     $recurring_id = mysqli_insert_id($mysqli);
 
-    mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_description = 'Recurring Invoice created!', history_created_at = NOW(), history_recurring_id = $recurring_id, company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Active', history_description = 'Recurring Invoice created!', history_created_at = NOW(), history_recurring_id = $recurring_id, company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Recurring', log_action = 'Created', log_description = '$start_date - $category', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id");
@@ -2938,7 +2938,7 @@ if(isset($_POST['edit_recurring'])){
 
     mysqli_query($mysqli,"UPDATE recurring SET recurring_scope = '$scope', recurring_frequency = '$frequency', recurring_category_id = $category, recurring_status = $status, recurring_updated_at = NOW() WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
 
-    mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_description = 'Recurring modified', history_created_at = NOW(), history_recurring_id = $recurring_id, company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = '$status', history_description = 'Recurring modified', history_created_at = NOW(), history_recurring_id = $recurring_id, company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Recurring', log_action = 'Modified', log_description = '$recurring_id', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id");
@@ -2977,36 +2977,6 @@ if(isset($_GET['delete_recurring'])){
   
 }
 
-if(isset($_GET['recurring_activate'])){
-
-    $recurring_id = intval($_GET['recurring_activate']);
-
-    mysqli_query($mysqli,"UPDATE recurring SET recurring_status = 1 WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
-
-    //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Recurring', log_action = 'Modified', log_description = 'Activated', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id");
-
-    $_SESSION['alert_message'] = "Recurring Invoice Activated";
-    
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if(isset($_GET['recurring_deactivate'])){
-
-    $recurring_id = intval($_GET['recurring_deactivate']);
-
-    mysqli_query($mysqli,"UPDATE recurring SET recurring_status = 0 WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
-
-    //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Recurring', log_action = 'Modified', log_description = 'Deactivated', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id");
-
-    $_SESSION['alert_message'] = "Recurring Invoice Deactivated";
-    
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
 if(isset($_POST['add_recurring_item'])){
 
     $recurring_id = intval($_POST['recurring_id']);
diff --git a/recurring.php b/recurring.php
index 8040e949..c4197c01 100644
--- a/recurring.php
+++ b/recurring.php
@@ -211,13 +211,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                 </button>
                 <div class="dropdown-menu">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editRecurringModal<?php echo $recurring_id; ?>">Edit</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item" href="post.php?force_recurring=<?php echo $recurring_id; ?>">Force</a>
-                  <?php if($recurring_status == 1){ ?>
-                    <a class="dropdown-item" href="post.php?recurring_deactivate=<?php echo $recurring_id; ?>">Deactivate</a>
-                  <?php }else{ ?>
-                    <a class="dropdown-item" href="post.php?recurring_activate=<?php echo $recurring_id; ?>">Activate</a>
-                  <?php } ?>
                   <div class="dropdown-divider"></div>
                     <a class="dropdown-item text-danger" href="post.php?delete_recurring=<?php echo $recurring_id; ?>">Delete</a>
                 </div>
diff --git a/recurring_invoice.php b/recurring_invoice.php
index c7915ecf..cefaef84 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -85,11 +85,6 @@ if(isset($_GET['recurring_id'])){
 
     <div class="row">
       <div class="col-md-4">
-        <?php if($recurring_status == 1){ ?>
-          <a class="btn btn-secondary btn-sm" href="post.php?recurring_deactivate=<?php echo $recurring_id; ?>"><i class='fa fa-fw fa-ban'></i> Deactivate</a>
-        <? }else{ ?>
-          <a class="btn btn-success btn-sm" href="post.php?recurring_activate=<?php echo $recurring_id; ?>"><i class='fa fa-fw fa-check'></i> Activate</a>
-        <?php } ?>
       </div>
       <div class="col-md-8">
         <div class="dropdown dropleft text-center">
diff --git a/ticket.php b/ticket.php
index 08027f6e..2a8cbc50 100644
--- a/ticket.php
+++ b/ticket.php
@@ -207,7 +207,7 @@ if(isset($_GET['ticket_id'])){
             <div class="media-body">
               <?php echo $ticket_reply_by_display; ?>
               <br>
-              <small class="text-muted"><?php echo $ticket_reply_created_at; ?> <?php if(!empty($ticket_reply_updated_at)){ echo "(modified: $ticket_reply_updated_at)"; } ?></small>
+              <small class="text-muted"><?php echo $ticket_reply_created_at; ?> <?php if(!empty($ticket_reply_updated_at)){ echo "modified: $ticket_reply_updated_at"; } ?></small>
             </div>
           </div>
         </h3>