Index: handlers/views_handler_argument.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_argument.inc,v
retrieving revision 1.7.2.10
diff -u -p -r1.7.2.10 views_handler_argument.inc
--- handlers/views_handler_argument.inc	19 Jan 2010 21:59:04 -0000	1.7.2.10
+++ handlers/views_handler_argument.inc	25 Jan 2010 19:01:41 -0000
@@ -293,7 +293,7 @@ class views_handler_argument extends vie
     $plugin = $this->get_plugin('argument validator', $validate_id);
     if ($plugin) {
       $options = &$form_state['values']['options']['argument_validate'][$validate_id];
-      $plugin->options_submit($form['argument_validate'][$default_id], $form_state, $options);
+      $plugin->options_submit($form['argument_validate'][$validate_id], $form_state, $options);
       // Copy the now submitted options to their final resting place so they get saved.
       $form_state['values']['options']['validate_options'] = $options;
     }
Index: modules/user/views_plugin_argument_validate_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_plugin_argument_validate_user.inc,v
retrieving revision 1.2.2.2
diff -u -p -r1.2.2.2 views_plugin_argument_validate_user.inc
--- modules/user/views_plugin_argument_validate_user.inc	19 Jan 2010 21:59:04 -0000	1.2.2.2
+++ modules/user/views_plugin_argument_validate_user.inc	25 Jan 2010 19:01:42 -0000
@@ -19,7 +19,7 @@ class views_plugin_argument_validate_use
   }
 
   function options_form(&$form, &$form_state) {
-    $form['validate_user_argument_type'] = array(
+    $form['type'] = array(
       '#type' => 'radios',
       '#title' => t('Type of user argument to allow'),
       '#options' => array(
@@ -30,7 +30,7 @@ class views_plugin_argument_validate_use
       '#default_value' => $this->options['type'],
     );
 
-    $form['validate_user_restrict_roles'] = array(
+    $form['restrict_roles'] = array(
       '#type' => 'checkbox',
       '#title' => t('Restrict user based on role'),
       '#default_value' => $this->options['restrict_roles'],
@@ -38,7 +38,7 @@ class views_plugin_argument_validate_use
 
     $form['roles'] = array(
       '#type' => 'checkboxes',
-      '#prefix' => '<div id="edit-options-validate-user-roles-wrapper">',
+      '#prefix' => '<div id="edit-options-argument-validate-user-roles-wrapper">',
       '#suffix' => '</div>',
       '#title' => t('Restrict to the selected roles'),
       '#options' => user_roles(TRUE),
@@ -46,7 +46,7 @@ class views_plugin_argument_validate_use
       '#description' => t('If no roles are selected, users from any role will be allowed.'),
       '#process' => array('expand_checkboxes', 'views_process_dependency'),
       '#dependency' => array(
-        'edit-options-validate-user-restrict-roles' => array(1),
+        'edit-options-argument-validate-user-restrict-roles' => array(1),
       ),
     );
   }