diff --git a/includes/calendar_plugin_row_node.inc b/includes/calendar_plugin_row_node.inc
index c3d15d3..787168b 100644
--- a/includes/calendar_plugin_row_node.inc
+++ b/includes/calendar_plugin_row_node.inc
@@ -124,7 +124,7 @@ class calendar_plugin_row_node extends views_plugin_row {
       '#default_value' => $this->options['colors']['taxonomy_field'],
       '#description' => t("Select the taxonomy term field to use when setting stripe colors."),
       '#options' => $vocab_field_options,
-      '#element_validate' => array('calendar_validate_hex_color'),
       '#dependency' => array('edit-row-options-colors-legend' => array('taxonomy')),
       );
     if (empty($vocab_field_options)) {
@@ -146,7 +146,7 @@ class calendar_plugin_row_node extends views_plugin_row {
       '#options' => $options,
       '#description' => t('Select vocabularies to use for setting calendar legend colors by taxonomy term. This works best for vocabularies with only a limited number of possible terms.'),
       '#dependency' => array('edit-row-options-colors-legend' => array('taxonomy')),
-      '#access' => !empty($field_options),
+      '#access' => !empty($vocab_field_options),
     );
 
     $vocabularies = (array) $this->options['colors']['calendar_colors_vocabulary'];
@@ -160,10 +160,10 @@ class calendar_plugin_row_node extends views_plugin_row {
           '#default_value' => isset($term_colors[$term->tid]) ? $term_colors[$term->tid] : '#ffffff',
           '#size' => 7,
           '#maxlength' => 7,
-          '#access' => !empty($field_options),
+          '#access' => !empty($vocab_field_options),
           '#dependency' => array('edit-row-options-colors-legend' => array('taxonomy')),
           '#element_validate' => array('calendar_validate_hex_color'),
-          '#dependency' => array('edit-row-options-colors-legend' => array('type')),
           '#prefix' => '<div class="calendar-colorpicker-wrapper">',
           '#suffix' => '<div class="calendar-colorpicker"></div></div>',
           '#attributes' => array('class' => array('edit-calendar-colorpicker')),