Index: user_import.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_import/user_import.module,v
retrieving revision 1.26
diff -u -p -r1.26 user_import.module
--- user_import.module	20 Sep 2009 11:58:10 -0000	1.26
+++ user_import.module	14 Aug 2010 16:28:44 -0000
@@ -1330,24 +1330,13 @@ function _user_import_random_username() 
     return $username;
 } 
 
-// check if any updates are to be made
-function _user_import_update_user_check($settings) {
-
-  foreach ($settings as $setting) {
-    if ($setting != UPDATE_NONE) return TRUE;
-  }
-  
-  return FALSE;
-}
-  
 function _user_import_process($settings) {  
 
     user_import_load_supported();
     $line_max = variable_get('user_import_line_max', 1000);
     $import_max = variable_get('user_import_max', 250);
     $field_match = _user_import_unconcatenate_field_match($settings['field_match']);
-    $update_setting = _user_import_update_user_check($settings['options']['update_user']);
-    $update_setting_per_module = $settings['options']['update_user'];
+    $update_setting = $settings['options']['update_user'];
     
     ini_set('auto_detect_line_endings', true);
     $handle = @fopen($settings['filepath'], "r");
@@ -1410,7 +1399,7 @@ function _user_import_process($settings)
  
                 // if we update existing users matched by email (and therefore passed validation even if this email already exists)
                 // look for and use an existing account.
-                if ($update_setting && !empty($fields['user']['email'][0])) {
+                if ($update_setting['user'] == UPDATE_REPLACE && !empty($fields['user']['email'][0])) {
                   $existing_account = user_load(array('mail' => $fields['user']['email'][0]));
                   if ($existing_account) $account = (array) $existing_account; 
                 }
Index: supported/user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_import/supported/user.inc,v
retrieving revision 1.8
diff -u -p -r1.8 user.inc
--- supported/user.inc	20 Sep 2009 11:58:10 -0000	1.8
+++ supported/user.inc	14 Aug 2010 16:28:44 -0000
@@ -34,6 +34,7 @@ function user_user_import_form_fieldset(
  * Implementation of hook_user_import_form_update_user().
  */
 function user_user_import_form_update_user() {
+  $form['user'] = array('title' => t('Users'), 'description' => t('Affected: users.'));
   $form['roles'] = array('title' => t('Roles'), 'description' => t('Affected: roles assigned to user.'));
   $form['password'] = array('title' => t('Password'), 'description' => t('Affected: password.'), 'exclude_add' => TRUE);
   $form['contact'] = array('title' => t('Contact'), 'description' => t('Affected: user contact option.'), 'exclude_add' => TRUE);
@@ -231,7 +232,7 @@ function user_user_import_edit_email_fie
     return;
 }
 
-function _user_import_validate_email($email = NULL, $duplicates_allowed = FALSE) {
+function _user_import_validate_email($email = NULL, $update_setting = array()) {
 
   if (empty($email)) {
     user_import_errors(t('no email'));
@@ -240,7 +241,7 @@ function _user_import_validate_email($em
     user_import_errors(t('invalid email'));
   }
   // Handle duplicate emails.
-  elseif (!$duplicates_allowed && _user_import_existing_uid($email)) {
+  elseif ($update_setting['user'] != UPDATE_ADD && _user_import_existing_uid($email)) {
     user_import_errors(t('duplicate email'));
   }