diff --git a/app/Mail/User/UserAdded.php b/app/Mail/User/UserAdded.php
index 2c07fbbcb8a7..d732bce479f9 100644
--- a/app/Mail/User/UserAdded.php
+++ b/app/Mail/User/UserAdded.php
@@ -15,6 +15,7 @@ namespace App\Mail\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\App;
 
 class UserAdded extends Mailable
 {
@@ -45,6 +46,8 @@ class UserAdded extends Mailable
      */
     public function build()
     {
+        App::setLocale($this->company->getLocale());
+
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.created_user'))
             ->view('email.admin.user_added')
diff --git a/app/Mail/User/UserLoggedIn.php b/app/Mail/User/UserLoggedIn.php
index 3b59d1baf606..2a270d73aa35 100644
--- a/app/Mail/User/UserLoggedIn.php
+++ b/app/Mail/User/UserLoggedIn.php
@@ -15,6 +15,7 @@ namespace App\Mail\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\App;
 
 class UserLoggedIn extends Mailable
 {
@@ -45,6 +46,8 @@ class UserLoggedIn extends Mailable
      */
     public function build()
     {
+        App::setLocale($this->company->getLocale());
+
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.new_login_detected'))
             ->view('email.admin.notification')
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 44a4310b696f..9fae70263482 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -222,6 +222,14 @@ class HtmlEngine
 
         $data['$quote.balance_due'] = &$data['$balance_due'];
         $data['$invoice.balance_due'] = &$data['$balance_due'];
+
+
+        if ($this->entity_string == 'credit') {
+            $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.credit_balance')];
+            $data['$balance_due_raw'] = ['value' => $this->entity->balance, 'label' => ctrans('texts.credit_balance')];
+            $data['$amount_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.amount')];         
+        }
+
         // $data['$balance_due'] = $data['$balance_due'];
         $data['$outstanding'] = &$data['$balance_due'];
         $data['$partial_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', 'label' => ctrans('texts.partial_due')];