diff --git a/app/Http/Livewire/BillingPortalPurchase.php b/app/Http/Livewire/BillingPortalPurchase.php
index 8053b6c67a50..ebe0ca6c2688 100644
--- a/app/Http/Livewire/BillingPortalPurchase.php
+++ b/app/Http/Livewire/BillingPortalPurchase.php
@@ -263,6 +263,17 @@ class BillingPortalPurchase extends Component
             }
         }
 
+        if(array_key_exists('currency_id', $this->request_data)) {
+
+            $currency = Cache::get('currencies')->filter(function ($item){
+                return $item->id == $this->request_data['currency_id'];
+            })->first();
+
+            if($currency)
+                $data['settings']->currency_id = $currency->id;
+
+        }
+
         if (array_key_exists('locale', $this->request_data)) {
             $request = $this->request_data;
 
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index dd3c7cb38574..f35a75f51031 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -177,7 +177,7 @@ class CompanyTransformer extends EntityTransformer
             'inventory_notification_threshold' => (int) $company->inventory_notification_threshold,
             'track_inventory' => (bool) $company->track_inventory,
             'enable_applying_payments' => (bool) $company->enable_applying_payments,
-            'enabled_expense_tax_rates' =. (bool) $company->enabled_expense_tax_rates,
+            'enabled_expense_tax_rates' => (bool) $company->enabled_expense_tax_rates,
         ];
     }
 
diff --git a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
index 3c53f02aae60..51c34fd695e1 100644
--- a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
@@ -20,7 +20,7 @@
                     @foreach($subscription->service()->products() as $product)
                         <div class="flex items-center justify-between mb-4 bg-white rounded px-6 py-4 shadow-sm border">
                             <div>
-                                <p class="text-sm text-gray-800">{!! $product->notes !!}</p>
+                                <p class="text-sm text-gray-800">{!! nl2br($product->notes) !!}</p>
                             </div>
                             <div data-ref="price-and-quantity-container">
                                 <span
@@ -40,7 +40,7 @@
 
                     @foreach($subscription->service()->recurring_products() as $product)
                         <div class="flex items-center justify-between mb-4 bg-white rounded px-6 py-4 shadow-sm border">
-                            <div class="text-sm">{!! $product->notes !!}</div>
+                            <div class="text-sm">{!! nl2br($product->notes) !!}</div>
                             <div data-ref="price-and-quantity-container">
                                 <span
                                     data-ref="price">{{ \App\Utils\Number::formatMoney($product->price, $subscription->company) }}</span>