diff --git a/VERSION.txt b/VERSION.txt
index 17799edf2630..f8f87624c1bd 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.3.76
\ No newline at end of file
+5.3.77
\ No newline at end of file
diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php
index 5b6f29958042..4a31ff867cad 100644
--- a/app/DataMapper/EmailTemplateDefaults.php
+++ b/app/DataMapper/EmailTemplateDefaults.php
@@ -180,7 +180,7 @@ class EmailTemplateDefaults
 
     public static function emailReminder1Subject()
     {
-        return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']);
+        return ctrans('texts.reminder_subject', ['invoice'=>'$number', 'account'=>'$company.name']);
     }
 
     public static function emailReminder1Template()
@@ -190,7 +190,7 @@ class EmailTemplateDefaults
 
     public static function emailReminder2Subject()
     {
-        return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']);
+        return ctrans('texts.reminder_subject', ['invoice'=>'$number', 'account'=>'$company.name']);
     }
 
     public static function emailReminder2Template()
@@ -200,7 +200,7 @@ class EmailTemplateDefaults
 
     public static function emailReminder3Subject()
     {
-        return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']);
+        return ctrans('texts.reminder_subject', ['invoice'=>'$number', 'account'=>'$company.name']);
     }
 
     public static function emailReminder3Template()
@@ -210,7 +210,7 @@ class EmailTemplateDefaults
 
     public static function emailReminderEndlessSubject()
     {
-        return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']);
+        return ctrans('texts.reminder_subject', ['invoice'=>'$number', 'account'=>'$company.name']);
     }
 
     public static function emailReminderEndlessTemplate()
diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
index cfaf0bdb2dd7..2c452328b891 100644
--- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php
+++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
@@ -198,7 +198,7 @@ class NinjaPlanController extends Controller
             if($account)
             {
                 //offer the option to have a free trial
-                if(!$account->trial_started)
+                if(!$account->trial_started && !$account->plan)
                     return $this->trial();
 
                 if(Carbon::parse($account->plan_expires)->lt(now())){
diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php
index be15ce093b97..b600c8c65b4f 100644
--- a/app/Models/RecurringInvoice.php
+++ b/app/Models/RecurringInvoice.php
@@ -383,8 +383,11 @@ class RecurringInvoice extends BaseModel
             case self::FREQUENCY_TWO_YEARS:
                 return ctrans('texts.freq_two_years');
                 break;
+            case self::FREQUENCY_THREE_YEARS:
+                return ctrans('texts.freq_three_years');
+                break;
             default:
-                // code...
+                return '';
                 break;
         }
     }
diff --git a/app/Observers/QuoteObserver.php b/app/Observers/QuoteObserver.php
index 6e32b7f4e234..49fbaf8dc689 100644
--- a/app/Observers/QuoteObserver.php
+++ b/app/Observers/QuoteObserver.php
@@ -33,7 +33,7 @@ class QuoteObserver
 
         if ($subscriptions) {
             $quote->load('client');
-            WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company);
+            WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company, 'client');
         }
     }
 
@@ -53,7 +53,7 @@ class QuoteObserver
 
         if ($subscriptions) {
             $quote->load('client');
-            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_QUOTE, $quote, $quote->company);
+            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_QUOTE, $quote, $quote->company, 'client');
         }
 
     }
@@ -72,7 +72,7 @@ class QuoteObserver
 
         if ($subscriptions) {
             $quote->load('client');
-            WebhookHandler::dispatch(Webhook::EVENT_DELETE_QUOTE, $quote, $quote->company);
+            WebhookHandler::dispatch(Webhook::EVENT_DELETE_QUOTE, $quote, $quote->company, 'client');
         }
     }
 
diff --git a/config/ninja.php b/config/ninja.php
index 4fcab1bfcbef..7ef7b53d3b8a 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.3.76',
-    'app_tag' => '5.3.76',
+    'app_version' => '5.3.77',
+    'app_tag' => '5.3.77',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),