diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 28efb452caf1..54383b06ede0 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -279,8 +279,8 @@ class TaskController extends BaseController
         
         $task = $this->task_repo->save($request->all(), $task);
 
-        if($task->status_order != $old_task->status_order)
-            $this->task_repo->sortStatuses($old_task, $task);
+        // if($task->status_order != $old_task->status_order)
+        //     $this->task_repo->sortStatuses($old_task, $task);
 
         event(new TaskWasUpdated($task, $task->company, Ninja::eventVars(auth()->user()->id)));
 
diff --git a/app/Http/ValidationRules/Payment/ValidInvoicesRules.php b/app/Http/ValidationRules/Payment/ValidInvoicesRules.php
index b1b489c9e977..0f4c67791d8c 100644
--- a/app/Http/ValidationRules/Payment/ValidInvoicesRules.php
+++ b/app/Http/ValidationRules/Payment/ValidInvoicesRules.php
@@ -84,7 +84,7 @@ class ValidInvoicesRules implements Rule
             }
             else if($invoice['amount'] > $inv->balance) {
 
-                $this->error_msg = ctrans('texts.amount_greater_than_balance');
+                $this->error_msg = ctrans('texts.amount_greater_than_balance_v5');
 
                 return false;
             }
diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php
index 651d4a8b84a1..795c4cce5866 100644
--- a/app/Services/Subscription/SubscriptionService.php
+++ b/app/Services/Subscription/SubscriptionService.php
@@ -250,11 +250,12 @@ class SubscriptionService
                                      ->where('balance', '>', 0)
                                      ->first();
 
+        $pro_rata_refund = null;
 
         // we calculate the pro rata refund for this invoice.
         if($outstanding_invoice)
         {
-
+            // $pro_rata_refund = $this->calculateProRataRefund($out
         }
 
         //logic
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index fb9b863e0949..ccb94b0dc641 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -120,6 +120,12 @@ class TemplateEngine
             }
         }
 
+        $converter = new CommonMarkConverter([
+            'allow_unsafe_links' => false,
+        ]);
+
+        $this->body = $converter->convertToHtml($this->body);
+        
         return $this;
     }
 
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 76df1c0f39f1..09945112a32d 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -4209,6 +4209,8 @@ $LANG = array(
     'activity_82' => ':user archived subscription :subscription',
     'activity_83' => ':user deleted subscription :subscription',
     'activity_84' => ':user restored subscription :subscription',
+    'amount_greater_than_balance_v5' => 'The amount is greater than the invoice balance. You cannot overpay an invoice.',
+
 );
 
 return $LANG;