diff --git a/app/Http/Controllers/TaskStatusController.php b/app/Http/Controllers/TaskStatusController.php
index 01f6756a3970..6eff15de446c 100644
--- a/app/Http/Controllers/TaskStatusController.php
+++ b/app/Http/Controllers/TaskStatusController.php
@@ -124,6 +124,7 @@ class TaskStatusController extends BaseController
      */
     public function update(UpdateTaskStatusRequest $request, TaskStatus $task_status)
     {
+        nlog($request->all());
         
         $task_status->fill($request->all());
         $reorder = $task_status->isDirty('status_order');
diff --git a/app/Repositories/TaskStatusRepository.php b/app/Repositories/TaskStatusRepository.php
index 0ff8904d0c79..3740325a4c96 100644
--- a/app/Repositories/TaskStatusRepository.php
+++ b/app/Repositories/TaskStatusRepository.php
@@ -56,13 +56,20 @@ class TaskStatusRepository extends BaseRepository
 
     public function reorder(TaskStatus $task_status)
     {
+nlog("i am dirty");
 
+nlog(TaskStatus::query()
+                  ->where('company_id', $task_status->company_id)
+                  ->orderByRaw('ISNULL(status_order), status_order ASC')
+                  ->orderBy('status_order', 'DESC')->pluck('name'));
+                  
         TaskStatus::query()
                   ->where('company_id', $task_status->company_id)
                   ->orderByRaw('ISNULL(status_order), status_order ASC')
-                  ->orderBy('updated_at', 'DESC')
+                  ->orderBy('status_order', 'DESC')
                   ->cursor()
                   ->each(function ($task_status, $index) {
+                    nlog($index." ".$task_status->name);
                       $task_status->update(['status_order' => $index+1]);
                   });
 
diff --git a/app/Transformers/RecurringInvoiceTransformer.php b/app/Transformers/RecurringInvoiceTransformer.php
index 5addf17b6aab..b692ff838fdd 100644
--- a/app/Transformers/RecurringInvoiceTransformer.php
+++ b/app/Transformers/RecurringInvoiceTransformer.php
@@ -91,6 +91,7 @@ class RecurringInvoiceTransformer extends EntityTransformer
             'date' => $invoice->date ?: '',
             'last_sent_date' => $invoice->last_sent_date ?: '',
             'next_send_date' => $invoice->next_send_date_client ?: '',
+            'next_send_datetime' => $invoice->next_send_date ?: '',
             'due_date' => $invoice->due_date ?: '',
             'terms' => $invoice->terms ?: '',
             'public_notes' => $invoice->public_notes ?: '',