diff --git a/modules/taxonomy.views.inc b/modules/taxonomy.views.inc
index 96f9551..5a243b2 100644
--- a/modules/taxonomy.views.inc
+++ b/modules/taxonomy.views.inc
@@ -457,14 +457,14 @@ function taxonomy_views_plugins() {
         'path' => drupal_get_path('module', 'views') . '/modules/taxonomy',
       ),
     ),
-//    'argument default' => array(
-//      'taxonomy_tid' => array(
-//        'title' => t('Taxonomy Term ID from URL'),
-//        'handler' => 'views_plugin_argument_default_taxonomy_tid',
-//        'path' => drupal_get_path('module', 'views') . '/modules/taxonomy',
-//        'parent' => 'fixed',
-//      ),
-//    ),
+   'argument default' => array(
+     'taxonomy_tid' => array(
+       'title' => t('Taxonomy Term ID from URL'),
+       'handler' => 'views_plugin_argument_default_taxonomy_tid',
+       'path' => drupal_get_path('module', 'views') . '/modules/taxonomy',
+       'parent' => 'fixed',
+     ),
+   ),
   );
 }
 
diff --git a/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc b/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
index af1fc6c..f492a9a 100644
--- a/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
+++ b/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
@@ -5,22 +5,23 @@
  */
 
 class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_default {
+  var $option_name = 'default_taxonomy_tid';
   function option_definition() {
     $options = parent::option_definition();
 
-    $options['term_page'] = array('default' => TRUE);
-    $options['node'] = array('default' => FALSE);
-    $options['limit'] = array('default' => FALSE);
-    $options['vids'] = array('default' => array());
+    $options[$this->options_name . '_term_page'] = array('default' => TRUE);
+    $options[$this->options_name . '_node'] = array('default' => FALSE);
+    $options[$this->options_name . '_limit'] = array('default' => FALSE);
+    $options[$this->options_name . '_vids'] = array('default' => array());
 
     return $options;
   }
 
   function argument_form(&$form, &$form_state) {
-    $form['term_page'] = array(
+    $form[$this->option_name . '_term_page'] = array(
       '#type' => 'checkbox',
       '#title' => t('Load default argument from term page'),
-      '#default_value' => $this->argument->options['term_page'],
+      '#default_value' => $this->argument->options[$this->option_name . '_term_page'],
       '#process' => array('views_process_dependency'),
       '#dependency' => array(
         'radio:options[default_action]' => array('default'),
@@ -28,10 +29,10 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d
       ),
       '#dependency_count' => 2,
     );
-    $form['node'] = array(
+    $form[$this->option_name . '_node'] = array(
       '#type' => 'checkbox',
-      '#title' => t('Load default argument from node page. Good for related taxonomy blocks.'),
-      '#default_value' => $this->argument->options['node'],
+      '#title' => t('Load default argument from node page, thats good for related taxonomy blocks'),
+      '#default_value' => $this->argument->options[$this->option_name . '_node'],
       '#process' => array('views_process_dependency'),
       '#dependency' => array(
         'radio:options[default_action]' => array('default'),
@@ -40,15 +41,15 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d
       '#dependency_count' => 2,
     );
 
-    $form['limit'] = array(
+    $form[$this->option_name . '_limit'] = array(
       '#type' => 'checkbox',
       '#title' => t('Limit terms by vocabulary'),
-      '#default_value'=> $this->argument->options['limit'],
+      '#default_value'=> $this->argument->options[$this->option_name . '_limit'],
       '#process' => array('views_process_dependency'),
       '#dependency' => array(
         'radio:options[default_action]' => array('default'),
         'radio:options[default_argument_type]' => array($this->id),
-        'edit-options-node' => array(1)
+        'edit-options-default-taxonomy-tid-node' => array(1),
       ),
       '#dependency_count' => 3,
     );
@@ -59,39 +60,34 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d
       $options[$voc->vid] = check_plain($voc->name);
     }
 
-    $form['vids'] = array(
-      '#prefix' => '<div><div id="edit-options-vids">',
+    $form[$this->option_name . '_vids'] = array(
+      '#prefix' => '<div><div id="edit-options-default-taxonomy-tid-vids-wrapper">',
       '#suffix' => '</div></div>',
       '#type' => 'checkboxes',
       '#title' => t('Vocabularies'),
       '#description' => t('If you wish to limit terms for specific vocabularies, check them; if none are checked, all terms will be included.'),
       '#options' => $options,
-      '#default_value' => isset($this->argument->options['vids']) ? $this->argument->options['vids'] : array(),
+      '#default_value' => isset($this->argument->options[$this->option_name . '_vids']) ? $this->argument->options[$this->option_name . '_vids'] : array(),
       '#process' => array('expand_checkboxes', 'views_process_dependency'),
       '#dependency' => array(
         'radio:options[default_action]' => array('default'),
         'radio:options[default_argument_type]' => array($this->id),
-        'edit-options-node' => array(1),
-        'edit-options-limit' => array(1)
+        'edit-options-default-taxonomy-tid-limit' => array(1),
+        'edit-options-default-taxonomy-tid-node' => array(1),
       ),
       '#dependency_count' => 4,
     );
   }
 
-  function options_submit(&$form, &$form_state, &$options) {
-    // Clear checkbox values.
-    $options['vids'] = array_filter($options['vids']);
-  }
-
   function get_argument() {
     // Load default argument from taxonomy page.
-    if (!empty($this->argument->options['term_page'])) {
+    if (!empty($this->argument->options[$this->option_name . '_term_page'])) {
       if (arg(0) == 'taxonomy' && arg(1) == 'term' && is_numeric(arg(2))) {
         return arg(2);
       }
     }
     // Load default argument from node.
-    if (!empty($this->argument->options['node'])) {
+    if (!empty($this->argument->options[$this->option_name . '_node'])) {
       foreach (range(1, 3) as $i) {
         $node = menu_get_object('node', $i);
         if (!empty($node)) {
@@ -100,11 +96,11 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d
       }
       // Just check, if a node could be detected.
       if ($node) {
-        if (!empty($this->argument->options['limit'])) {
+        if (!empty($this->argument->options[$this->option_name . '_limit'])) {
           $tids = array();
           // Filter by vid.
           foreach ($node->taxonomy as $tid => $term) {
-            if (!empty($this->argument->options['vids'][$term->vid])) {
+            if (!empty($this->argument->options[$this->option_name . '_vids'][$term->vid])) {
               $tids[] = $tid;
             }
           }
@@ -116,6 +112,13 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d
         }
       }
     }
+
+    // If the current page is a view that takes tid as an argument,
+    // find the tid argument and return it.
+    $views_page = views_get_page_view();
+    if ($views_page && isset($views_page->view->argument['tid'])) {
+      return $views_page->view->argument['tid']->argument;
+    }
   }
 }