--- user_import.module	2006-02-19 20:14:17.000000000 +0100
+++ user_import_new.module	2006-02-19 20:08:56.000000000 +0100
@@ -422,7 +422,7 @@ function user_import_settings($import, $
     $roles_data = user_roles();
     // remove 'anonymous user' option
     while (list ($rid, $role_name) = each ($roles_data)) {
-        if ($role_name != 'anonymous user') $roles[$rid] = $role_name;
+        if ($role_name != 'anonymous user' AND $role_name != 'authenticated user') $roles[$rid] = $role_name;
     }
 
     $form['roles'] = array(
@@ -559,7 +559,7 @@ function user_import_settings_validate($
    
    // check at least one role has been chosen 
    foreach ($form_values['roles']['options'] as $role) {
-        if ($role == 1) $roles = TRUE;
+        if ($role) $roles = TRUE;
    }
    
    if (!$roles) form_set_error('roles', t('At least one role must be set.'));
@@ -959,8 +959,8 @@ function _user_import_process($settings)
     $settings = _user_import_setting($settings);
 
     // get enabled roles
-    while (list ($rid, $set) = each ($settings['roles']['options'])) {
-        if ($set == 1) $roles[] = $rid;
+    foreach ($settings['roles']['options'] as $rid => $set) {
+      if ($set > 0) $roles[] = $rid;
     }
     
     $handle = @fopen($settings['filepath'], "r");