--- webform.module.orig	2008-01-22 17:47:58.000000000 +1000
+++ webform.module	2008-01-30 12:03:10.000000000 +1000
@@ -1729,6 +1729,7 @@ function webform_get_cid($node, $form_ke
 function _webform_safe_name($name) {
   $new = drupal_strtolower(trim($name));
   $new = str_replace(' ', '_', $new);
+  $new = html_entity_decode($new);
   $new = preg_replace('/[^a-z0-9_]/', '', $new);
   // If the string contains NO safe characters, base64 encode the answer.
   if ($new == '') {