--- webform/webform.module	Mon Mar 05 21:44:52 2007
+++ webform.module	Tue Apr 17 17:54:06 2007
@@ -1423,7 +1423,7 @@
   $new = str_replace(' ', '_', $new);
   $new = preg_replace('/[^a-z0-9_]/', '', $new);
   // If the string contains NO safe characters, base64 encode the answer
-  if ($new == '') {
+  if ($new == '' or !preg_match('/[^_]+/', $new)) {
     $new = base64_encode($name);
   }
   return $new;