Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.205
diff -u -p -r1.205 form.inc
--- includes/form.inc	8 Jun 2007 12:51:58 -0000	1.205
+++ includes/form.inc	14 Jun 2007 13:52:59 -0000
@@ -792,7 +792,7 @@ function _form_builder_handle_input_elem
     array_unshift($form['#parents'], $name);
   }
   if (!isset($form['#id'])) {
-    $form['#id'] = form_clean_id('edit-'. implode('-', $form['#parents']));
+    $form['#id'] = form_clean_id('edit-'. implode('-', $form['#parents']) .'-'. $form_id);
   }
 
   if (!empty($form['#disabled'])) {