diff --git a/enrol/authorize/config.html b/enrol/authorize/config.html
index 978de40ea14..f7befc65d8c 100755
--- a/enrol/authorize/config.html
+++ b/enrol/authorize/config.html
@@ -133,10 +133,10 @@ if (!isset($frm->acceptccs)) {
 <tr valign="top">
     <td align="right">an_acceptmethods:</td>
     <td><?php print_string("adminacceptmethods", "enrol_authorize") ?><br /><?php
-    $allpaymentmethods = get_list_of_payment_methods(true);
     $paymentmethodsenabled = get_list_of_payment_methods();
+    $allpaymentmethods = get_list_of_payment_methods(true);
     foreach ($allpaymentmethods as $key) {
-        print_checkbox('acceptmethods[]', $key, in_array($key, $paymentmethodsenabled), get_string('method'.strtolower($key),'enrol_authorize')); echo "<br />\n";
+        print_checkbox('acceptmethods[]', $key, in_array($key, $paymentmethodsenabled), get_string('method'.$key,'enrol_authorize')); echo "<br />\n";
     }
     ?><br /></td>
 </tr>
@@ -144,9 +144,10 @@ if (!isset($frm->acceptccs)) {
 <tr valign="top">
     <td align="right">an_acceptccs:</td>
     <td><?php print_string("adminacceptccs", "enrol_authorize") ?><br /><?php
+    $acceptedccs = array_keys(get_list_of_creditcards());
     $allccs = get_list_of_creditcards(true);
     foreach ($allccs as $key => $val) {
-        print_checkbox('acceptccs[]', $key, stristr($CFG->an_acceptccs, $key) !== false, $val); echo "<br />\n";
+        print_checkbox('acceptccs[]', $key, in_array($key, $acceptedccs), $val); echo "<br />\n";
     }
     ?><br /></td>
 </tr>
diff --git a/enrol/authorize/enrol.html b/enrol/authorize/enrol.html
index ecc01beef16..71886dd862f 100755
--- a/enrol/authorize/enrol.html
+++ b/enrol/authorize/enrol.html
@@ -32,7 +32,7 @@ function print_cc_form($classreference)
     global $CFG, $USER;
 
     $formvars = array(
-        'password', 'ccaddress', 'cccity', 'ccstate', 'cccountry', 'cczip',
+        'ccaddress', 'cccity', 'ccstate', 'cccountry', 'cczip',
         'ccfirstname', 'cclastname', 'cc', 'ccexpiremm', 'ccexpireyyyy', 'cctype', 'cvv'
     );
     foreach ($formvars as $var) {
@@ -147,7 +147,7 @@ function print_echeck_form($classreference)
         global $form, $course;
         global $CFG, $USER;
 
-        $formvars = array('password', 'abacode', 'accnum', 'acctype', 'bankname', 'firstname', 'lastname');
+        $formvars = array('abacode', 'accnum', 'acctype', 'bankname', 'firstname', 'lastname');
         foreach ($formvars as $var) {
             if (!isset($form->$var)) {
                 $form->$var = '';