diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index d008f38f0bd1..93cb4d6cfbb7 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -133,6 +133,7 @@ class PaymentEmailEngine extends BaseEmailEngine
         $data['$email'] = ['value' => isset($this->contact) ? $this->contact->email : 'no contact email on record', 'label' => ctrans('texts.email')];
         $data['$client_name'] = ['value' => $this->client->present()->name() ?: ' ', 'label' => ctrans('texts.client_name')];
         $data['$client.name'] = &$data['$client_name'];
+        $data['$client'] = &$data['client_name'];
         $data['$client.address1'] = &$data['$address1'];
         $data['$client.address2'] = &$data['$address2'];
         $data['$client_address'] = ['value' => $this->client->present()->address() ?: ' ', 'label' => ctrans('texts.address')];
diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php
index 429202661a17..5e513c9eb015 100644
--- a/app/Mail/SupportMessageSent.php
+++ b/app/Mail/SupportMessageSent.php
@@ -60,11 +60,12 @@ class SupportMessageSent extends Mailable
 
         $company = auth()->user()->company();
         $user = auth()->user();
+        $db = str_replace("db-ninja-", "", $company->db);
 
         if(Ninja::isHosted())
-            $subject = "{$priority}Hosted-{$company->db} :: Customer Support - {$plan} ".date('M jS, g:ia');
+            $subject = "{$priority}Hosted-{$company->db} :: {$plan} :: ".date('M jS, g:ia');
         else
-            $subject = "{$priority}Self Hosted :: Customer Support - [{$plan}] ".date('M jS, g:ia');
+            $subject = "{$priority}Self Hosted :: {$plan} :: ".date('M jS, g:ia');
 
         return $this->from(config('mail.from.address'), $user->present()->name()) 
                 ->replyTo($user->email, $user->present()->name())
diff --git a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
index 5fdcec6f96fd..e690af365e3c 100644
--- a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
+++ b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
@@ -15,9 +15,7 @@ class ActivatePaytracePaymentDriver extends Migration
     public function up()
     {
 
-        $paytrace = Gateway::find(46);
-
-        if($paytrace)
+        if($paytrace = Gateway::find(46))
         {
             $fields = json_decode($paytrace->fields);
             $fields->integratorId = "";