Index: includes/webform.components.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.components.inc,v
retrieving revision 1.25.2.4
diff -u -r1.25.2.4 webform.components.inc
--- includes/webform.components.inc	11 Mar 2010 01:40:15 -0000	1.25.2.4
+++ includes/webform.components.inc	21 Mar 2010 03:00:10 -0000
@@ -140,7 +140,7 @@
 
   // Add a row containing form elements for a new item.
   unset($form['add']['name']['#title'], $form['add_type']['#description']);
-  $form['add']['name']['#value'] = t('New component name');
+  $form['add']['name']['#attributes']['rel'] = t('New component name');
   $form['add']['name']['#attributes']['class'] = 'webform-default-value';
   $form['add']['cid']['#attributes']['class'] = 'webform-cid';
   $form['add']['pid']['#attributes']['class'] = 'webform-pid';
Index: includes/webform.emails.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.emails.inc,v
retrieving revision 1.9.2.2
diff -u -r1.9.2.2 webform.emails.inc
--- includes/webform.emails.inc	8 Mar 2010 01:04:08 -0000	1.9.2.2
+++ includes/webform.emails.inc	21 Mar 2010 03:00:10 -0000
@@ -127,7 +127,7 @@
  */
 function theme_webform_email_add_form($form) {
   // Add a default value to the custom e-mail textfield.
-  $form['email_custom']['#value'] = t('email@example.com');
+  $form['email_custom']['#attributes']['rel'] = t('email@example.com');
   $form['email_custom']['#attributes']['class'] = 'webform-set-active webform-default-value';
   $form['email_option']['custom']['#title'] = $form['email_option']['custom']['#title'] . ': ' . drupal_render($form['email_custom']);
 
Index: webform.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.js,v
retrieving revision 1.6
diff -u -r1.6 webform.js
--- webform.js	23 Jan 2010 06:25:09 -0000	1.6
+++ webform.js	21 Mar 2010 03:00:08 -0000
@@ -18,10 +18,13 @@
 Drupal.webform = new Object();
 
 Drupal.webform.defaultValues = function(context) {
-  var $fields = $('.webform-default-value', context);
-  var $forms = $('.webform-default-value', context).parents('form:first');
+  var $fields = $('.webform-default-value:not(.error)', context);
+  var $forms = $fields.parents('form:first');
   $fields.each(function() {
-    this.defaultValue = this.value;
+    this.defaultValue = $(this).attr('rel');
+    if (this.value != this.defaultValue) {
+      $(this).removeClass('webform-default-value');
+    }
     $(this).focus(function() {
       if (this.value == this.defaultValue) {
         this.value = '';