diff --git a/app/Services/Pdf/PdfMock.php b/app/Services/Pdf/PdfMock.php
index c39fc6f2632b..d6fb4e5aa53c 100644
--- a/app/Services/Pdf/PdfMock.php
+++ b/app/Services/Pdf/PdfMock.php
@@ -204,9 +204,9 @@ class PdfMock
          [
     '$client.shipping_postal_code' => '46420',
     '$client.billing_postal_code' => '11243',
-    '$company.city_state_postal' => 'Beveley Hills, CA, 90210',
-    '$company.postal_city_state' => 'CA',
-    '$company.postal_city' => '90210, CA',
+    '$company.city_state_postal' => "{$this->settings->city}, {$this->settings->state}, {$this->settings->postal_code}",
+    '$company.postal_city_state' => "{$this->settings->postal_code}, {$this->settings->city}, {$this->settings->state}",
+    '$company.postal_city' => "{$this->settings->postal_code}, {$this->settings->state}",
     '$product.gross_line_total' => '100',
     '$client.classification' => 'Individual',
     '$company.classification' => 'Business',
@@ -262,9 +262,9 @@ class PdfMock
     '$company.id_number' => $this->settings->id_number,
     '$invoice.po_number' => 'PO12345',
     '$invoice_total_raw' => 0.0,
-    '$postal_city_state' => '11243 Aufderharchester, North Carolina',
+    '$postal_city_state' => "{$this->settings->postal_code}, {$this->settings->city}, {$this->settings->state}",
     '$client.vat_number' => '975977515',
-    '$city_state_postal' => 'Aufderharchester, North Carolina 11243',
+    '$city_state_postal' => "{$this->settings->city}, {$this->settings->state}, {$this->settings->postal_code}",
     '$contact.full_name' => 'Benedict Eichmann',
     '$contact.last_name' => 'Eichmann',
     '$company.country_2' => 'US',
@@ -275,7 +275,7 @@ class PdfMock
     '$statement_amount' => '',
     '$task.description' => '',
     '$product.discount' => '',
-    '$entity_issued_to' => 'Bob JOnes',
+    '$entity_issued_to' => 'Bob Jones',
     '$assigned_to_user' => '',
     '$product.quantity' => '',
     '$total_tax_labels' => '',
@@ -303,10 +303,10 @@ class PdfMock
     '$invoice.custom2' => 'custom value',
     '$invoice.custom3' => 'custom value',
     '$invoice.custom4' => 'custom value',
-    '$company.custom1' => 'custom value',
-    '$company.custom2' => 'custom value',
-    '$company.custom3' => 'custom value',
-    '$company.custom4' => 'custom value',
+    '$company.custom1' => $this->company->custom_value1,
+    '$company.custom2' => $this->company->custom_value2,
+    '$company.custom3' => $this->company->custom_value3,
+    '$company.custom4' => $this->company->custom_value4,
     '$quote.po_number' => 'PO12345',
     '$company.website' => $this->settings->website,
     '$balance_due_raw' => '0.00',
@@ -317,8 +317,8 @@ class PdfMock
     '$user.first_name' => 'Derrick Monahan DDS',
     '$created_by_user' => 'Derrick Monahan DDS Erna Wunsch',
     '$client.currency' => 'USD',
-    '$company.country' => 'United States',
-    '$company.address' => 'Christiansen Garden<br/>70218 Lori Station Suite 529<br/>New Loy, Delaware 29359<br/>United States<br/>Phone: 1-240-886-2233<br/>Email: immanuel53@example.net<br/>',
+    '$company.country' => $this->company->country()?->name ?? 'USA',
+    '$company.address' => $this->company->present()->address(),
     '$tech_hero_image' => 'http://ninja.test:8000/images/pdf-designs/tech-hero-image.jpg',
     '$task.tax_name1' => '',
     '$task.tax_name2' => '',
@@ -450,15 +450,15 @@ class PdfMock
     '$task.tax' => '',
     '$discount' => '$0.00',
     '$subtotal' => '$0.00',
-    '$company1' => 'custom value',
-    '$company2' => 'custom value',
-    '$company3' => 'custom value',
-    '$company4' => 'custom value',
+    '$company1' => $this->company->custom_value1,
+    '$company2' => $this->company->custom_value2,
+    '$company3' => $this->company->custom_value3,
+    '$company4' => $this->company->custom_value4,
     '$due_date' => '2022-01-01',
     '$poNumber' => 'PO-123456',
     '$quote_no' => '0029',
-    '$address2' => '63993 Aiyana View',
-    '$address1' => '8447',
+    '$address2' => $this->settings->address2,
+    '$address1' => $this->settings->address1,
     '$viewLink' => '<a class="button" href="http://ninja.test:8000/client/invoice/UAUY8vIPuno72igmXbbpldwo5BDDKIqs">View Invoice</a>',
     '$autoBill' => 'This invoice will automatically be billed to your credit card on file on the due date.',
     '$view_url' => 'http://ninja.test:8000/client/invoice/UAUY8vIPuno72igmXbbpldwo5BDDKIqs',
@@ -477,7 +477,7 @@ class PdfMock
     '$country' => 'United States',
     '$contact' => 'Benedict Eichmann',
     '$app_url' => 'http://ninja.test:8000',
-    '$website' => 'http://www.parisian.org/',
+    '$website' => $this->settings->website,
     '$entity' => '',
     '$thanks' => 'Thanks!',
     '$amount' => '$30.00',