diff --git a/classes/gateway.php b/classes/gateway.php
index f7b6cb7..b8d3d0e 100644
--- a/classes/gateway.php
+++ b/classes/gateway.php
@@ -77,12 +77,24 @@ public static function add_configuration_to_gateway_form(\core_payment\form\acco
         $mform->setType('fixdesc', PARAM_TEXT);
         $mform->addHelpButton('fixdesc', 'fixdesc', 'paygw_payanyway');
 
-        $mform->addElement('advcheckbox', 'skipmode', get_string('skipmode', 'paygw_payanyway'), '0');
-        $mform->setType('skipmode', PARAM_TEXT);
+        $mform->addElement('static');
+
+        $mform->addElement(
+            'advcheckbox',
+            'skipmode',
+            get_string('skipmode', 'paygw_payanyway'),
+            get_string('skipmode', 'paygw_payanyway')
+        );
+        $mform->setType('skipmode', PARAM_INT);
         $mform->addHelpButton('skipmode', 'skipmode', 'paygw_payanyway');
 
-        $mform->addElement('advcheckbox', 'passwordmode', get_string('passwordmode', 'paygw_payanyway'), '0');
-        $mform->setType('passwordmode', PARAM_TEXT);
+        $mform->addElement(
+            'advcheckbox',
+            'passwordmode',
+            get_string('passwordmode', 'paygw_payanyway'),
+            get_string('passwordmode', 'paygw_payanyway')
+        );
+        $mform->setType('passwordmode', PARAM_INT);
         $mform->disabledIf('passwordmode', 'skipmode', "neq", 0);
 
         $mform->addElement('text', 'password', get_string('password', 'paygw_payanyway'));
diff --git a/pay.php b/pay.php
index cb388e9..93fefc5 100644
--- a/pay.php
+++ b/pay.php
@@ -146,7 +146,6 @@
     die; // Never.
 }
 
-
 // Save payment.
 $paymentid = helper::save_payment(
     $payable->get_account_id(),
diff --git a/return.php b/return.php
index bd0a951..2ed4908 100644
--- a/return.php
+++ b/return.php
@@ -46,6 +46,7 @@
 $itemid      = $payment->itemid;
 
 $url = helper::get_success_url($component, $paymentarea, $itemid);
+
 if ($payanywaytx->success) {
     redirect($url, get_string('payment_success', 'paygw_payanyway'), 0, 'success');
 } else {