diff --git a/app/PaymentDrivers/CBAPowerBoard/CreditCard.php b/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
index bb416636c401..167b3bf1b3b3 100644
--- a/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
+++ b/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
@@ -260,7 +260,6 @@ class CreditCard implements LivewireMethodInterface
         nlog($r->body());
 
         if($r->failed()){
-            // return $this->processUnsuccessfulPayment($r);
 
             $error_payload = $this->getErrorFromResponse($r);
             throw new PaymentFailed($error_payload[0], $error_payload[1]);
@@ -391,7 +390,9 @@ class CreditCard implements LivewireMethodInterface
 
                 return $this->processSuccessfulPayment($charge);
             }
-
+            elseif($charge->error){
+                throw new PaymentFailed($charge->error->message, $charge->status);
+            }
 
         }
 
diff --git a/resources/views/portal/ninja2020/gateways/powerboard/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/powerboard/credit_card/pay.blade.php
index 8bbbe0cf3072..fce0cec0d0d3 100644
--- a/resources/views/portal/ninja2020/gateways/powerboard/credit_card/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/powerboard/credit_card/pay.blade.php
@@ -88,49 +88,15 @@
     <script src="{{ $widget_endpoint }}"></script>
     
     <script>
-        var widget = new cba.HtmlWidget('#widget', '{{ $public_key }}', '{{ $gateway_id }}');
+    
+    /** Loads the widget, links the widget to a dummy form */
+    var widget = new cba.HtmlWidget('#widget', '{{ $public_key }}', '{{ $gateway_id }}');
         widget.setEnv("{{ $environment }}");
         widget.useAutoResize();
         widget.interceptSubmitForm('#stepone');
         widget.onFinishInsert('#server-response input[name="gateway_response"]', "payment_source");
         widget.load();
     
-        // widget.trigger('tab', function (data){
-
-        //     console.log("tab Response", data);
-
-        //     console.log(widget.isValidForm());
-
-        //     let payNow = document.getElementById('pay-now');
-
-        //     payNow.disabled = widget.isInvalidForm();
-
-        // });
-
-        // widget.trigger('submit_form',function (data){
-
-        //     console.log("submit_form Response", data);
-
-        //     console.log(widget.isValidForm());
-
-        //     let payNow = document.getElementById('pay-now');
-
-        //     payNow.disabled = widget.isInvalidForm();
-
-        // });
-
-        // widget.trigger('tab',function (data){
-
-        //     console.log("tab Response", data);
-
-        //     console.log(widget.isValidForm());
-
-        //     let payNow = document.getElementById('pay-now');
-
-        //     payNow.disabled = widget.isInvalidForm();
-
-        // });
-
         widget.on("systemError", function(data) {
             console.log("systemError Response", data);
         });
@@ -139,7 +105,8 @@
             console.log("validationError", data);
         });
         
-        widget.on("finish", async function(data) {
+        /** Retrieves the payment_source token and passes this to the 3ds handler */
+        widget.on("finish", function(data) {
             document.getElementById('errors').hidden = true;
 
             console.log("finish");
@@ -168,13 +135,19 @@
         let payNow = document.getElementById('pay-now');
 
         payNow.addEventListener('click', () => {
+
             
+            const div = document.getElementById('widget');
+
             widget.getValidationState();
 
-            // if(!widget.isValidForm()){
-            //     console.log("invalid");
-            //     return;
-            // }
+            if(!widget.isValidForm() && div.offsetParent !== null){
+                console.log("invalid");
+                payNow.disabled = false;
+                payNow.querySelector('svg').classList.add('hidden');
+                payNow.querySelector('span').classList.remove('hidden');
+                return;
+            }
 
             payNow.disabled = true;
             payNow.querySelector('svg').classList.remove('hidden');
@@ -188,7 +161,6 @@
                 document.getElementById('store_card').value = storeCard.value;
             }
 
-            const div = document.getElementById('widget');
             
             if(div.offsetParent !== null)
                 document.getElementById('stepone_submit').click();