diff --git a/hierarchical_select.module b/hierarchical_select.module
index 02b2797..666ee52 100644
--- a/hierarchical_select.module
+++ b/hierarchical_select.module
@@ -349,12 +349,18 @@ function _hs_process_determine_hsid($element, &$form_state) {
   // generate a new one based on the last HSID used (which is
   // stored in form state storage).
   if (!isset($element['#value']) || !is_array($element['#value']) || !array_key_exists('hsid', $element['#value'])) {
+    // Do we have a default value?
+    if (!empty($element['#default_value'])) {
+      $hsid = array_shift($element['#default_value']);
+    }
+    else {
     if (!isset($form_state['storage']['hs']['last_hsid'])) {
       $form_state['storage']['hs']['last_hsid'] = -1;
     }
     $form_state['storage']['hs']['last_hsid']++;
     $hsid = $form_state['storage']['hs']['last_hsid'];
   }
+  }
   else {
     $hsid = check_plain($element['#value']['hsid']);
   }
@@ -1028,7 +1034,7 @@ function _hierarchical_select_process_calculate_selections(&$element, $hsid, $fo
   //   therefor set either manually or by another module),
   // then use the value of #default_value, or when available, of #value.  
   if (empty($form_state['input']) || (!isset($element['#value']['hierarchical_select']) && !isset($element['#value']['dropbox']))) {
-    $value = (isset($element['#value'])) ? $element['#value'] : $element['#default_value'];
+    $value = (!empty($element['#value'])) ? $element['#value'] : $element['#default_value'];
     $value = (is_array($value)) ? $value : array($value);
     if ($dropbox) {
       $db_selection = $value;
diff --git a/modules/hs_taxonomy.module b/modules/hs_taxonomy.module
index f2aae7a..cfc086a 100644
--- a/modules/hs_taxonomy.module
+++ b/modules/hs_taxonomy.module
@@ -711,7 +711,7 @@ function hs_taxonomy_hierarchical_select_item_get_label($item, $params) {
     }
 
     // Use the translated term when available!
-    if (module_exists('i18ntaxonomy') && i18ntaxonomy_vocabulary($term->vid) == I18N_TAXONOMY_LOCALIZE) {
+    if (module_exists('i18n_taxonomy')) {
       $labels[$item] = i18n_taxonomy_term_name($term);
     }
     else {