diff --git a/supported/user_import.inc b/supported/user_import.inc
index 953df78..3de1cde 100644
--- a/supported/user_import.inc
+++ b/supported/user_import.inc
@@ -100,6 +100,7 @@ function _user_import_edit_settings_fields(&$form, $import, $collapsed) {
   $form['optional'] = array(
       '#type' => 'fieldset',
       '#title' => t('Options'),
+      '#tree' => TRUE,
       '#weight' => -85,
       '#collapsible' => TRUE,
       '#collapsed' => $collapsed,

diff --git a/user_import.module b/user_import.module
index a185e06..a62048a 100644
--- a/user_import.module
+++ b/user_import.module
@@ -1194,14 +1194,31 @@ function _user_import_settings_save($settings) {
 			$settings['options'][$value] = isset($settings[$value]) ? $settings[$value] : '';
 		}
 		
+    // Settings that have their own column
+    $columns = array('name', 'pointer', 'processed', 'valid', 'first_line_skip', 'contact', 'username_space', 'send_email', 'field_match', 'roles');
+    
+    foreach ($settings['optional'] as $option => $value) {
+      if (!in_array($option, $columns)) {
+        // This will capture any options that are added to the "optional (Options)" fieldset via
+        // the hook_user_import_form_fieldsets.  It will also capture the 'activate' setting as well.
+        $settings['options'][$option] = $value;
+      }
+      else {
+        // This will capture options that have their own columns
+        $settings[$option] = $value;
+      }
+    }
+    // We're done with the 'optional' array, so let's clean up
+    unset($settings['optional']);
+    
 		$settings['name'] = isset($settings['name']) ? $settings['name'] : '';
 		$settings['pointer'] = isset($settings['pointer']) ? $settings['pointer'] : 0;
 		$settings['processed'] = isset($settings['processed']) ? $settings['processed'] : 0;
 		$settings['valid'] = isset($settings['valid']) ? $settings['valid'] : 0;
-		$settings['first_line_skip'] = isset($settings['first_line_skip']) ? $settings['first_line_skip'] : 0;
-		$settings['contact'] = isset($settings['contact']) ? $settings['contact'] : 0;
-		$settings['username_space'] = isset($settings['username_space']) ? $settings['username_space'] : 0;
-		$settings['send_email'] = isset($settings['send_email']) ? $settings['send_email'] : 0;
+		// $settings['first_line_skip'] = isset($settings['first_line_skip']) ? $settings['first_line_skip'] : 0;
+		// $settings['contact'] = isset($settings['contact']) ? $settings['contact'] : 0;
+		// $settings['username_space'] = isset($settings['username_space']) ? $settings['username_space'] : 0;
+		// $settings['send_email'] = isset($settings['send_email']) ? $settings['send_email'] : 0;
 		$settings['field_match'] = isset($settings['field_match']) ? $settings['field_match'] : array();
 		$settings['roles'] = isset($settings['roles']) ? $settings['roles'] : '';