diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 1c7cab3601..0e0e2a420c 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -137,9 +137,9 @@ class PreviewController extends BaseController
      */
     public function show()
     {
-        // if(request()->has('template')) {
+        if(request()->has('template')) {
             return $this->template();
-        // }
+        }
 
         if (request()->has('entity') &&
             request()->has('entity_id') &&
diff --git a/app/Models/Presenters/ClientPresenter.php b/app/Models/Presenters/ClientPresenter.php
index aed92c0eb8..e9ada6d652 100644
--- a/app/Models/Presenters/ClientPresenter.php
+++ b/app/Models/Presenters/ClientPresenter.php
@@ -103,7 +103,7 @@ class ClientPresenter extends EntityPresenter
         if ($cityState = $this->getShippingCityState()) {
             $str .= e($cityState).'<br/>';
         }
-        if ($country = $client->shipping_country) {
+        if ($country = $client->shipping_country ?? $client->country) {
             $str .= e($country->name).'<br/>';
         }