diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php
index 7c2e75966b91..d03a98a11fdd 100644
--- a/app/Http/Controllers/EmailController.php
+++ b/app/Http/Controllers/EmailController.php
@@ -143,8 +143,8 @@ class EmailController extends BaseController
             }
         });
 
+        $entity_obj = $entity_obj->fresh();
         $entity_obj->last_sent_date = now();
-
         $entity_obj->save();
 
         /*Only notify the admin ONCE, not once per contact/invite*/
diff --git a/app/Http/Controllers/TwoFactorController.php b/app/Http/Controllers/TwoFactorController.php
index 01b2f8d9e456..eb0af9b8b7a3 100644
--- a/app/Http/Controllers/TwoFactorController.php
+++ b/app/Http/Controllers/TwoFactorController.php
@@ -11,6 +11,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Requests\TwoFactor\EnableTwoFactorRequest;
 use App\Models\User;
 use App\Transformers\UserTransformer;
 use Crypt;
@@ -51,17 +52,16 @@ class TwoFactorController extends BaseController
         return response()->json(['data' => $data], 200);
     }
 
-    public function enableTwoFactor()
+    public function enableTwoFactor(EnableTwoFactorRequest $request)
     {
         $google2fa = new Google2FA();
 
         $user = auth()->user();
-        $secret = request()->input('secret');
-        $oneTimePassword = request()->input('one_time_password');
+        $secret = $request->input('secret');
+        $oneTimePassword = $request->input('one_time_password');
 
         if ($google2fa->verifyKey($secret, $oneTimePassword) && $user->phone && $user->email_verified_at) {
             $user->google_2fa_secret = encrypt($secret);
-
             $user->save();
 
             return response()->json(['message' => ctrans('texts.enabled_two_factor')], 200);
@@ -72,6 +72,11 @@ class TwoFactorController extends BaseController
         return response()->json(['message' => 'No phone record or user is not confirmed'], 400);
     }
 
+    /*
+    * @param App\Models\User $user
+    * @param App\Models\User auth()->user()
+    */
+
     public function disableTwoFactor()
     {
         $user = auth()->user();
diff --git a/app/Http/Requests/TwoFactor/EnableTwoFactorRequest.php b/app/Http/Requests/TwoFactor/EnableTwoFactorRequest.php
new file mode 100644
index 000000000000..1c8864d36670
--- /dev/null
+++ b/app/Http/Requests/TwoFactor/EnableTwoFactorRequest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\Requests\TwoFactor;
+
+use App\Http\Requests\Request;
+use Illuminate\Validation\Rule;
+
+class EnableTwoFactorRequest extends Request
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize() : bool
+    {
+        return true;;
+    }
+
+    public function rules()
+    {
+        return [
+            'secret' => 'bail|required|string',
+            'one_time_password' => 'bail|required|string',
+        ];
+    }
+
+    public function prepareForValidation()
+    {
+
+    }
+}
diff --git a/app/Listeners/Credit/CreditEmailedNotification.php b/app/Listeners/Credit/CreditEmailedNotification.php
index b709b0a5ea27..7d94f864fdbc 100644
--- a/app/Listeners/Credit/CreditEmailedNotification.php
+++ b/app/Listeners/Credit/CreditEmailedNotification.php
@@ -40,7 +40,7 @@ class CreditEmailedNotification implements ShouldQueue
 
         // $first_notification_sent = true;
 
-        $credit = $event->invitation->credit;
+        $credit = $event->invitation->credit->fresh();
         $credit->last_sent_date = now();
         $credit->saveQuietly();
 
diff --git a/app/Listeners/Invoice/InvoiceEmailedNotification.php b/app/Listeners/Invoice/InvoiceEmailedNotification.php
index 8ad713627373..9dd91d0115d0 100644
--- a/app/Listeners/Invoice/InvoiceEmailedNotification.php
+++ b/app/Listeners/Invoice/InvoiceEmailedNotification.php
@@ -42,7 +42,7 @@ class InvoiceEmailedNotification implements ShouldQueue
 
         $first_notification_sent = true;
 
-        $invoice = $event->invitation->invoice;
+        $invoice = $event->invitation->invoice->fresh();
         $invoice->last_sent_date = now();
         $invoice->saveQuietly();
 
diff --git a/app/Listeners/Quote/QuoteEmailedNotification.php b/app/Listeners/Quote/QuoteEmailedNotification.php
index c5abc5ef8af5..a4bd87845459 100644
--- a/app/Listeners/Quote/QuoteEmailedNotification.php
+++ b/app/Listeners/Quote/QuoteEmailedNotification.php
@@ -42,7 +42,7 @@ class QuoteEmailedNotification implements ShouldQueue
 
         // $first_notification_sent = true;
 
-        $quote = $event->invitation->quote;
+        $quote = $event->invitation->quote->fresh();
         $quote->last_sent_date = now();
         $quote->saveQuietly();
 
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index 740c21a5fdd3..6905bd03e635 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -300,10 +300,10 @@ class InvoiceService
         } elseif ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) {
             $this->setStatus(Invoice::STATUS_PARTIAL);
         }
-        elseif($this->invoice->balance < 0) {
-            $this->setStatus(Invoice::STATUS_PARTIAL);   
+        elseif ($this->invoice->balance < 0 || $this->invoice->balance > 0) {
+            $this->invoice->status_id = Invoice::STATUS_SENT;
         }
-
+        
         return $this;
     }
 
@@ -318,7 +318,7 @@ class InvoiceService
         } elseif ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) {
             $this->invoice->status_id = Invoice::STATUS_PARTIAL;
         }
-        elseif ($this->invoice->balance < 0) {
+        elseif ($this->invoice->balance < 0 || $this->invoice->balance > 0) {
             $this->invoice->status_id = Invoice::STATUS_SENT;
         }