diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index 928a75f36e06..b6895b3db4a8 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -354,10 +354,15 @@ class NinjaMailerJob implements ShouldQueue
if(!str_contains($this->nmo->to_user->email, "@"))
return true;
- /* On the hosted platform if the user has not verified their account we fail here */
- if(Ninja::isHosted() && $this->company->account && !$this->company->account->account_sms_verified)
+ /* On the hosted platform if the user has not verified their account we fail here - but still check what they are trying to send! */
+ if(Ninja::isHosted() && $this->company->account && !$this->company->account->account_sms_verified){
+
+ if(class_exists(\Modules\Admin\Jobs\Account\EmailQuality::class))
+ return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run();
+
return true;
-
+ }
+
/* On the hosted platform we actively scan all outbound emails to ensure outbound email quality remains high */
if(class_exists(\Modules\Admin\Jobs\Account\EmailQuality::class))
return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run();
diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index 4395b662472e..95c3e15c1cc9 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -222,6 +222,7 @@ class PaymentEmailEngine extends BaseEmailEngine
$data['$view_link'] = ['value' => ''.ctrans('texts.view_payment').'', 'label' => ctrans('texts.view_payment')];
$data['$view_button'] = &$data['$view_link'];
+ $data['$viewButton'] = &$data['$view_link'];
$data['$viewLink'] = &$data['$view_link'];
$data['$paymentLink'] = &$data['$view_link'];
$data['$portalButton'] = ['value' => "".ctrans('texts.login').'', 'label' =>''];
diff --git a/resources/views/email/template/admin.blade.php b/resources/views/email/template/admin.blade.php
index 86e7cde9ed47..82b9df9e55a5 100644
--- a/resources/views/email/template/admin.blade.php
+++ b/resources/views/email/template/admin.blade.php
@@ -125,7 +125,7 @@