diff --git a/app/Utils/ClientPortal/CustomMessage/CustomMessage.php b/app/Utils/ClientPortal/CustomMessage/CustomMessage.php
index a417cd699..649370b62 100644
--- a/app/Utils/ClientPortal/CustomMessage/CustomMessage.php
+++ b/app/Utils/ClientPortal/CustomMessage/CustomMessage.php
@@ -82,18 +82,22 @@ class CustomMessage
             '$company.name' => optional($this->company)->getSetting('name'),
             '$company.website' => optional($this->company)->getSetting('website'),
 
-            '$client.id' => optional(optional($this->client)->present())->id,
-            '$client.name' => optional(optional($this->client)->present())->name,
-            '$client.website' => optional(optional($this->client)->present())->website,
-            '$client.public_notes' => optional(optional($this->client)->present())->public_notes,
-            '$client.phone' => optional(optional($this->client)->present())->phone,
-            '$client.balance' => optional(optional($this->client)->present())->balance,
+            '$client.id' => optional($this->client)->id,
+            '$client.name' => optional($this->client)->name,
+            '$client.website' => optional($this->client)->website,
+            '$client.public_notes' => optional($this->client)->public_notes,
+            '$client.phone' => optional($this->client)->phone,
+            '$client.balance' => optional($this->client)->balance,
             '$client.address1' => optional(optional($this->client)->present())->address1,
             '$client.address2' => optional(optional($this->client)->present())->address2,
             '$client.city' => optional(optional($this->client)->present())->city,
             '$client.state' => optional(optional($this->client)->present())->state,
             '$client.postal_code' => optional(optional($this->client)->present())->postal_code,
             '$client.country' => optional(optional(optional($this->client)->present())->country)->full_name,
+            '$client.address' => optional(optional($this->client)->present())->address(),
+            '$client.shipping_address' => optional(optional($this->client)->present())->shipping_address(),
+            '$client.primary_contact_name' => optional(optional($this->client)->present())->primary_contact_name(),
+            '$client.city_state' => optional(optional($this->client)->present())->getCityState(),
 
             '$contact.first_name' => optional($this->contact)->first_name,
             '$contact.last_name' => optional($this->contact)->last_name,