---
 sites/all/modules/client/webform_references/webform_references.node.inc | 2 +-
 sites/all/modules/client/webform_references/webform_references.term.inc | 2 +-
 sites/all/modules/client/webform_references/webform_references.user.inc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sites/all/modules/client/webform_references/webform_references.node.inc b/sites/all/modules/client/webform_references/webform_references.node.inc
index e275c8f..3cf53d7 100755
--- a/sites/all/modules/client/webform_references/webform_references.node.inc
+++ b/sites/all/modules/client/webform_references/webform_references.node.inc
@@ -234,7 +234,7 @@ function _webform_references_node_reference_view_validate($element, &$form_state
  * @see _webform_client_form_add_component()
  */
 function _webform_render_node_reference(array $component, array $value = NULL, $filter = TRUE) {
-  $default_value = array ($filter ? webform_replace_tokens($component['extra']['default_value']) : $component['extra']['default_value']);
+  $default_value = array ($filter ? _webform_filter_values($component['extra']['default_value']) : $component['extra']['default_value']);
   switch ($component['extra']['widget_type']) {
     case 'autocomplete':
       if (!empty($component['extra']['use_view'])) {
diff --git a/sites/all/modules/client/webform_references/webform_references.term.inc b/sites/all/modules/client/webform_references/webform_references.term.inc
index 303a117..5ecf1f1 100644
--- a/sites/all/modules/client/webform_references/webform_references.term.inc
+++ b/sites/all/modules/client/webform_references/webform_references.term.inc
@@ -242,7 +242,7 @@ function _webform_references_taxonomy_reference_view_validate($element, &$form_s
  * @see _webform_client_form_add_component()
  */
 function _webform_render_term_reference(array $component, array $value = NULL, $filter = TRUE) {
-  $default_value = array ($filter ? webform_replace_tokens($component['extra']['default_value']) : $component['extra']['default_value']);
+  $default_value = array ($filter ? _webform_filter_values($component['extra']['default_value']) : $component['extra']['default_value']);
   switch ($component['extra']['widget_type']) {
     case 'autocomplete':
       if (!empty($component['extra']['use_view'])) {
diff --git a/sites/all/modules/client/webform_references/webform_references.user.inc b/sites/all/modules/client/webform_references/webform_references.user.inc
index ae0fbf1..e8ad528 100644
--- a/sites/all/modules/client/webform_references/webform_references.user.inc
+++ b/sites/all/modules/client/webform_references/webform_references.user.inc
@@ -234,7 +234,7 @@ function _webform_references_user_reference_view_validate($element, &$form_state
  * @see _webform_client_form_add_component()
  */
 function _webform_render_user_reference(array $component, array $value = NULL, $filter = TRUE) {
-  $default_value = array ($filter ? webform_replace_tokens($component['extra']['default_value']) : $component['extra']['default_value']);
+  $default_value = array ($filter ? _webform_filter_values($component['extra']['default_value']) : $component['extra']['default_value']);
   switch ($component['extra']['widget_type']) {
     case 'autocomplete':
       if ($component['extra']['use_view']) {
--
2.6.4 (Apple Git-63)