--- htdocs/auth/db/lib.php-orig	2006-12-04 15:00:47.000000000 -0600
+++ htdocs/auth/db/lib.php	2006-12-05 14:20:57.608416960 -0600
@@ -106,10 +106,11 @@
             if ($rs = $authdb->Execute("SELECT ".$pcfg["field_map_$field"]." FROM $CFG->auth_dbtable
                                         WHERE $CFG->auth_dbfielduser = '$username'")) {
                 if ( $rs->RecordCount() == 1 ) {
+		    $extdbfieldname = $pcfg["field_map_$field"]; 
                     if (!empty($CFG->unicodedb)) {
-                        $result["$field"] = addslashes(stripslashes($rs->fields[0]));
+                        $result["$field"] = addslashes(stripslashes($rs->fields[$pcfg["field_map_$field"]]));
                     } else {
-                        $result["$field"] = addslashes(stripslashes(utf8_decode($rs->fields[0])));
+                        $result["$field"] = addslashes(stripslashes(utf8_decode($rs->fields[$pcfg["field_map_$field"]])));
                     }
                 }
             }
--- htdocs/enrol/database/enrol.php-orig	2006-12-05 11:14:28.954350920 -0600
+++ htdocs/enrol/database/enrol.php	2006-12-05 11:15:57.188937224 -0600
@@ -84,7 +84,7 @@
 
                 $courselist = array();
                 while (!$rs->EOF) {         // Make a nice little array of courses to process
-                    $courselist[] = $rs->fields[0];
+                    $courselist[] = $rs->fields[ $CFG->enrol_remotecoursefield ];
                     $rs->MoveNext();
                 }
                 $rs->Close();