diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 8c096364a68a..1c6bc259125d 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -652,13 +652,12 @@ class CompanySettings extends BaseSettings
             'total_columns' => [
                 '$subtotal',
                 '$discount',
-                '$total_taxes',
-                '$line_taxes',
                 '$custom_surcharge1',
                 '$custom_surcharge2',
                 '$custom_surcharge3',
                 '$custom_surcharge4',
-                '$total',
+                '$total_taxes',
+                '$line_taxes',
                 '$paid_to_date',
                 '$outstanding',
             ],
diff --git a/app/Http/Middleware/PasswordProtection.php b/app/Http/Middleware/PasswordProtection.php
index c22c1181df1e..1df11b733400 100644
--- a/app/Http/Middleware/PasswordProtection.php
+++ b/app/Http/Middleware/PasswordProtection.php
@@ -53,6 +53,7 @@ class PasswordProtection
 
                 /* Cannot allow duplicates! */
                 if ($existing_user = MultiDB::hasUser($query)) {
+                    Cache::add(auth()->user()->email.'_logged_in', Str::random(64), now()->addMinutes(30));
                     return $next($request);
                 }
             }
diff --git a/app/Models/User.php b/app/Models/User.php
index 36c7aec6ac39..bbe68cb2af51 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -80,6 +80,7 @@ class User extends Authenticatable implements MustVerifyEmail
         'custom_value3',
         'custom_value4',
         'is_deleted',
+        'google_2fa_secret',
     ];
 
     /**
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index f2fb53ce09b4..11dcbce10247 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -248,7 +248,6 @@ class HtmlEngine
         $data['$client.currency'] = ['value' => $this->client->currency()->code, 'label' => ''];
 
         $data['$client.balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
-        $data['$outstanding'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
         $data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
         $data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')];