diff --git a/components/hidden.inc b/components/hidden.inc
old mode 100644
new mode 100755
index 040ab5e..a056e8e
--- a/components/hidden.inc
+++ b/components/hidden.inc
@@ -55,10 +55,11 @@ function _webform_edit_hidden($component) {
  * Implements _webform_render_component().
  */
 function _webform_render_hidden($component, $value = NULL, $filter = TRUE) {
+  $node = isset($component['nid']) ? node_load($component['nid']) : NULL;
   $element = array(
     '#type' => 'hidden',
     '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'],
-    '#default_value' => $filter ? _webform_filter_values($component['value']) : $component['value'],
+    '#default_value' => $filter ? _webform_filter_values($component['value'], $node) : $component['value'],
     '#weight' => $component['weight'],
   );
 
diff --git a/components/textfield.inc b/components/textfield.inc
old mode 100644
new mode 100755
index ced2e19..d78b29e
--- a/components/textfield.inc
+++ b/components/textfield.inc
@@ -121,11 +121,12 @@ function _webform_edit_textfield($component) {
  * Implements _webform_render_component().
  */
 function _webform_render_textfield($component, $value = NULL, $filter = TRUE) {
+  $node = isset($component['nid']) ? node_load($component['nid']) : NULL;
   $element = array(
     '#type' => 'textfield',
     '#title' => $filter ? _webform_filter_xss($component['name']) : $component['name'],
     '#title_display' => $component['extra']['title_display'] ? $component['extra']['title_display'] : 'before',
-    '#default_value' => $filter ? _webform_filter_values($component['value'], NULL, NULL, NULL, FALSE) : $component['value'],
+    '#default_value' => $filter ? _webform_filter_values($component['value'], $node, NULL, NULL, FALSE) : $component['value'],
     '#required' => $component['mandatory'],
     '#weight' => $component['weight'],
     '#field_prefix' => empty($component['extra']['field_prefix']) ? NULL : ($filter ? _webform_filter_xss($component['extra']['field_prefix']) : $component['extra']['field_prefix']),