diff --git a/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php b/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php
index 0ba0ffda53..bb7539ba58 100644
--- a/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php
+++ b/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php
@@ -80,7 +80,7 @@ class AuthorizePaymentMethod
 
     public function authorizeCreditCard()
     {
-        $data['gateway'] = $this->authorize->company_gateway;
+        $data['gateway'] = $this->authorize;
         $data['public_client_id'] = $this->authorize->init()->getPublicClientKey();
         $data['api_login_id'] = $this->authorize->company_gateway->getConfigField('apiLoginId');
 
@@ -261,9 +261,9 @@ class AuthorizePaymentMethod
 
         // Set the transaction's refId
         $refId = 'ref' . time();
-        
+
           // Use an existing payment profile ID for this Merchant name and Transaction key
-          
+
           $request = new DeleteCustomerPaymentProfileRequest();
           $request->setMerchantAuthentication($this->authorize->merchant_authentication);
           $request->setCustomerProfileId($gateway_customer_reference);
diff --git a/resources/views/portal/ninja2020/gateways/authorize/credit_card/authorize.blade.php b/resources/views/portal/ninja2020/gateways/authorize/credit_card/authorize.blade.php
index b5990988ac..6a0535b3ff 100644
--- a/resources/views/portal/ninja2020/gateways/authorize/credit_card/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/authorize/credit_card/authorize.blade.php
@@ -18,7 +18,7 @@
           method="post" id="server_response">
         @csrf
 
-        <input type="hidden" name="company_gateway_id" value="{{ $gateway->id }}">
+        <input type="hidden" name="company_gateway_id" value="{{ $gateway->company_gateway->id }}">
         <input type="hidden" name="payment_method_id" value="1">
         <input type="hidden" name="gateway_response" id="gateway_response">
         <input type="hidden" name="is_default" id="is_default">
@@ -44,7 +44,7 @@
 @endsection
 
 @section('gateway_footer')
-    @if($gateway->getConfigField('testMode'))
+    @if($gateway->company_gateway->getConfigField('testMode'))
         <script src="https://jstest.authorize.net/v1/Accept.js" charset="utf-8"></script>
     @else
         <script src="https://js.authorize.net/v1/Accept.js" charset="utf-8"></script>
diff --git a/resources/views/portal/ninja2020/layout/app.blade.php b/resources/views/portal/ninja2020/layout/app.blade.php
index 160981306e..67e1d74747 100644
--- a/resources/views/portal/ninja2020/layout/app.blade.php
+++ b/resources/views/portal/ninja2020/layout/app.blade.php
@@ -126,7 +126,7 @@
         @yield('footer')
         @stack('footer')
 
-        @if((bool) \App\Utils\Ninja::isSelfHost())
+        @if((bool) \App\Utils\Ninja::isSelfHost() && !empty($client->getSetting('portal_custom_footer')))
             <div class="py-1 text-sm text-center text-white bg-primary">
                 {!! $client->getSetting('portal_custom_footer') !!}
             </div>