diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index 94132ce1d8ef..1de3cf6715e6 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -202,6 +202,7 @@ class ContactMailer extends Mailer
             'bccEmail' => $isFirst ? $account->getBccEmail() : false,
             'fromEmail' => $account->getFromEmail(),
             'proposal' => $proposal,
+            'tag' => $account->account_key,
         ];
 
         if (! $proposal) {
@@ -306,6 +307,7 @@ class ContactMailer extends Mailer
             'bccEmail' => $account->getBccEmail(),
             'fromEmail' => $account->getFromEmail(),
             'isRefund' => $refunded > 0,
+            'tag' => $account->account_key,
         ];
 
         if (! $refunded && $account->attachPDF()) {
diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php
index 1270e0390ba8..5fcad1bd416c 100644
--- a/app/Ninja/Mailers/Mailer.php
+++ b/app/Ninja/Mailers/Mailer.php
@@ -163,8 +163,8 @@ class Mailer
                 $message['Bcc'] = $data['bccEmail'];
             }
 
-            if (! empty($data['account'])) {
-                $message['Tag'] = $data['account']->account_key;
+            if (! empty($data['tag'])) {
+                $message['Tag'] = $data['tag'];
             }
 
             $response = $client->sendEmailBatch([$message]);