Index: user_import.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_import/user_import.module,v
retrieving revision 1.19
diff -u -r1.19 user_import.module
--- user_import.module	23 Jul 2007 22:55:10 -0000	1.19
+++ user_import.module	30 Oct 2007 16:13:39 -0000
@@ -1360,24 +1360,26 @@
 }
 
 function _user_import_settings_save($settings, $messages = NULL) {
- 
-     // move settings into 'options' column
-     // 'options' column will be used to store new control options - instead of creating a new column for each option
-    $settings['options']['groups'] = $settings['groups'];
-    $settings['options']['existing_og_subscribe'] = $settings['existing_og_subscribe'];
-    $settings['options']['existing_og_subject'] = $settings['existing_og_subject'];
-    $settings['options']['existing_og_markup'] = $settings['existing_og_markup'];
-    $settings['options']['existing_og_message'] = $settings['existing_og_message'];
-    $settings['options']['existing_og_css'] = $settings['existing_og_css'];   
-
-    $settings['options']['subject'] = $settings['subject'];
-    $settings['options']['message'] = $settings['message'];
-    $settings['options']['message_format'] = $settings['message_format'];
-    $settings['options']['message_css'] = $settings['message_css'];
-    
-    $settings['options']['activate'] = $settings['activate'];
-    $settings['options']['subscribed'] = $settings['subscribed'];
-    
+
+    if (isset($settings['op'])) {
+       // move settings into 'options' column only if coming from user_import_edit_form_submit
+       // 'options' column will be used to store new control options - instead of creating a new column for each option
+      $settings['options']['groups'] = $settings['groups'];
+      $settings['options']['existing_og_subscribe'] = $settings['existing_og_subscribe'];
+      $settings['options']['existing_og_subject'] = $settings['existing_og_subject'];
+      $settings['options']['existing_og_markup'] = $settings['existing_og_markup'];
+      $settings['options']['existing_og_message'] = $settings['existing_og_message'];
+      $settings['options']['existing_og_css'] = $settings['existing_og_css'];   
+  
+      $settings['options']['subject'] = $settings['subject'];
+      $settings['options']['message'] = $settings['message'];
+      $settings['options']['message_format'] = $settings['message_format'];
+      $settings['options']['message_css'] = $settings['message_css'];
+      
+      $settings['options']['activate'] = $settings['activate'];
+      $settings['options']['subscribed'] = $settings['subscribed'];
+
+    }    
     // Update settings for existing import
     if ($settings['import_id']) {