diff --git a/resources/views/app/pdf/estimate/partials/billing-address.blade.php b/resources/views/app/pdf/estimate/partials/billing-address.blade.php
index 3c60030c..2818a8b0 100644
--- a/resources/views/app/pdf/estimate/partials/billing-address.blade.php
+++ b/resources/views/app/pdf/estimate/partials/billing-address.blade.php
@@ -7,11 +7,11 @@
     @endif
     <p class="bill-user-address">
         @if($estimate->user->billingaddress->address_street_1)
-            {{$estimate->user->billingaddress->address_street_1}}<br>
+            {!! nl2br(htmlspecialchars($estimate->user->billingaddress->address_street_1)) !!}<br>
         @endif
 
         @if($estimate->user->billingaddress->address_street_2)
-            {{$estimate->user->billingaddress->address_street_2}}<br>
+            {!! nl2br(htmlspecialchars($estimate->user->billingaddress->address_street_2)) !!}<br>
         @endif
 
         @if($estimate->user->billingaddress->city)
diff --git a/resources/views/app/pdf/estimate/partials/company-address.blade.php b/resources/views/app/pdf/estimate/partials/company-address.blade.php
index 9d3f3843..f6cdb5c6 100644
--- a/resources/views/app/pdf/estimate/partials/company-address.blade.php
+++ b/resources/views/app/pdf/estimate/partials/company-address.blade.php
@@ -5,11 +5,11 @@
 @if($company_address)
     <p class="company-add">
         @if($company_address->addresses[0]['address_street_1'])
-            {{$company_address->addresses[0]['address_street_1']}} <br>
+            {!! nl2br(htmlspecialchars($company_address->addresses[0]['address_street_1'])) !!} <br>
         @endif
 
         @if($company_address->addresses[0]['address_street_2'])
-            {{$company_address->addresses[0]['address_street_2']}} <br>
+            {!! nl2br(htmlspecialchars($company_address->addresses[0]['address_street_2'])) !!} <br>
         @endif
         @if($company_address->addresses[0]['city'])
             {{$company_address->addresses[0]['city']}}
diff --git a/resources/views/app/pdf/estimate/partials/shipping-address.blade.php b/resources/views/app/pdf/estimate/partials/shipping-address.blade.php
index a93720fa..90d34531 100644
--- a/resources/views/app/pdf/estimate/partials/shipping-address.blade.php
+++ b/resources/views/app/pdf/estimate/partials/shipping-address.blade.php
@@ -7,11 +7,11 @@
     @endif
     <p class="ship-user-address">
         @if($estimate->user->shippingaddress->address_street_1)
-            {{$estimate->user->shippingaddress->address_street_1}}<br>
+            {!! nl2br(htmlspecialchars($estimate->user->shippingaddress->address_street_1)) !!}<br>
         @endif
 
         @if($estimate->user->shippingaddress->address_street_2)
-            {{$estimate->user->shippingaddress->address_street_2}}<br>
+            {!! nl2br(htmlspecialchars($estimate->user->shippingaddress->address_street_2)) !!}<br>
         @endif
 
         @if($estimate->user->shippingaddress->city && $estimate->user->shippingaddress->city)
diff --git a/resources/views/app/pdf/invoice/partials/billing-address.blade.php b/resources/views/app/pdf/invoice/partials/billing-address.blade.php
index 4510a9c1..d5292672 100644
--- a/resources/views/app/pdf/invoice/partials/billing-address.blade.php
+++ b/resources/views/app/pdf/invoice/partials/billing-address.blade.php
@@ -7,10 +7,10 @@
     @endif
     <p class="bill-user-address">
         @if($invoice->user->billingaddress->address_street_1)
-            {{$invoice->user->billingaddress->address_street_1}}<br>
+            {!! nl2br(htmlspecialchars($invoice->user->billingaddress->address_street_1)) !!}<br>
         @endif
         @if($invoice->user->billingaddress->address_street_2)
-            {{$invoice->user->billingaddress->address_street_2}}<br>
+            {!! nl2br(htmlspecialchars($invoice->user->billingaddress->address_street_2)) !!}<br>
         @endif
         @if($invoice->user->billingaddress->city && $invoice->user->billingaddress->city)
             {{$invoice->user->billingaddress->city}},
diff --git a/resources/views/app/pdf/invoice/partials/company-address.blade.php b/resources/views/app/pdf/invoice/partials/company-address.blade.php
index acc756e9..f45249ce 100644
--- a/resources/views/app/pdf/invoice/partials/company-address.blade.php
+++ b/resources/views/app/pdf/invoice/partials/company-address.blade.php
@@ -5,11 +5,11 @@
 @if($company_address)
     <p class="company-add">
         @if($company_address->addresses[0]['address_street_1'])
-            {{$company_address->addresses[0]['address_street_1']}} <br>
+            {!! nl2br(htmlspecialchars($company_address->addresses[0]['address_street_1'])) !!} <br>
         @endif
 
         @if($company_address->addresses[0]['address_street_2'])
-            {{$company_address->addresses[0]['address_street_2']}} <br>
+            {!! nl2br(htmlspecialchars($company_address->addresses[0]['address_street_2'])) !!} <br>
         @endif
         @if($company_address->addresses[0]['city'])
             {{$company_address->addresses[0]['city']}}
diff --git a/resources/views/app/pdf/invoice/partials/shipping-address.blade.php b/resources/views/app/pdf/invoice/partials/shipping-address.blade.php
index 1b12deaf..7a80dc80 100644
--- a/resources/views/app/pdf/invoice/partials/shipping-address.blade.php
+++ b/resources/views/app/pdf/invoice/partials/shipping-address.blade.php
@@ -7,11 +7,11 @@
     @endif
     <p class="ship-user-address">
         @if($invoice->user->shippingaddress->address_street_1)
-            {{$invoice->user->shippingaddress->address_street_1}}<br>
+            {!! nl2br(htmlspecialchars($invoice->user->shippingaddress->address_street_1)) !!}<br>
         @endif
 
         @if($invoice->user->shippingaddress->address_street_2)
-            {{$invoice->user->shippingaddress->address_street_2}}<br>
+            {!! nl2br(htmlspecialchars($invoice->user->shippingaddress->address_street_2)) !!}<br>
         @endif
 
         @if($invoice->user->shippingaddress->city && $invoice->user->shippingaddress->city)
diff --git a/resources/views/app/pdf/payment/partials/billing-address.blade.php b/resources/views/app/pdf/payment/partials/billing-address.blade.php
index b8c91cb6..01b29348 100644
--- a/resources/views/app/pdf/payment/partials/billing-address.blade.php
+++ b/resources/views/app/pdf/payment/partials/billing-address.blade.php
@@ -7,10 +7,10 @@
     @endif
     <p class="bill-user-address">
         @if($payment->user->billingaddress->address_street_1)
-            {{$payment->user->billingaddress->address_street_1}}<br>
+            {!! nl2br(htmlspecialchars($payment->user->billingaddress->address_street_1)) !!}<br>
         @endif
         @if($payment->user->billingaddress->address_street_2)
-            {{$payment->user->billingaddress->address_street_2}}<br>
+            {!! nl2br(htmlspecialchars($payment->user->billingaddress->address_street_2)) !!}<br>
         @endif
         @if($payment->user->billingaddress->city && $payment->user->billingaddress->city)
             {{$payment->user->billingaddress->city}},
diff --git a/resources/views/app/pdf/payment/partials/company-address.blade.php b/resources/views/app/pdf/payment/partials/company-address.blade.php
index 67bf9c85..5f82d059 100644
--- a/resources/views/app/pdf/payment/partials/company-address.blade.php
+++ b/resources/views/app/pdf/payment/partials/company-address.blade.php
@@ -5,11 +5,11 @@
 @if($company_address)
     <p class="company-add">
         @if($company_address->addresses[0]['address_street_1'])
-            {{$company_address->addresses[0]['address_street_1']}} <br>
+            {!! nl2br(htmlspecialchars($company_address->addresses[0]['address_street_1'])) !!} <br>
         @endif
 
         @if($company_address->addresses[0]['address_street_2'])
-            {{$company_address->addresses[0]['address_street_2']}} <br>
+            {!! nl2br(htmlspecialchars($company_address->addresses[0]['address_street_2'])) !!} <br>
         @endif
         @if($company_address->addresses[0]['city'])
             {{$company_address->addresses[0]['city']}}
diff --git a/resources/views/app/pdf/payment/partials/shipping-address.blade.php b/resources/views/app/pdf/payment/partials/shipping-address.blade.php
index b6e35fd0..95203320 100644
--- a/resources/views/app/pdf/payment/partials/shipping-address.blade.php
+++ b/resources/views/app/pdf/payment/partials/shipping-address.blade.php
@@ -7,11 +7,11 @@
     @endif
     <p class="ship-user-address">
         @if($payment->user->shippingaddress->address_street_1)
-            {{$payment->user->shippingaddress->address_street_1}}<br>
+            {!! nl2br(htmlspecialchars($payment->user->shippingaddress->address_street_1)) !!}<br>
         @endif
 
         @if($payment->user->shippingaddress->address_street_2)
-            {{$payment->user->shippingaddress->address_street_2}}<br>
+            {!! nl2br(htmlspecialchars($payment->user->shippingaddress->address_street_2)) !!}<br>
         @endif
 
         @if($payment->user->shippingaddress->city && $payment->user->shippingaddress->city)