diff --git a/app/Models/Account.php b/app/Models/Account.php
index bfbabd13ea..eb7d11cc02 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -310,7 +310,7 @@ class Account extends BaseModel
         }
 
         // 09-03-2023 - winds forward expiry checks to ensure we don't cut off users prior to billing cycle being commenced
-        if ($this->plan_expires && Carbon::parse($this->plan_expires)->lt(now()->subHours(12))) {
+        if ($this->plan_expires && Carbon::parse($this->plan_expires)->lt(now()->subHours(23))) {
             return false;
         }
 
diff --git a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
index 23580a5415..8cb6eac666 100644
--- a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
+++ b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
@@ -233,7 +233,7 @@ class AuthorizeCreditCard implements LivewireMethodInterface
     private function processSuccessfulResponse($data, $request)
     {
         $payment_hash = PaymentHash::where('hash', $request->input('payment_hash'))->firstOrFail();
-        $payment = $this->storePayment($payment_hash, $data);
+        $payment = $this->storePayment($payment_hash, $data, \App\Models\GatewayType::CREDIT_CARD);
 
         $vars = [
             'invoices' => $payment_hash->invoices(),