diff --git a/includes/common.inc b/includes/common.inc
index 885781947934f29dee09d3ff00a1d72eee555c67..035f04ab1654ffb80c5b8a7265d2cbeaeaf18dc5 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -730,7 +730,7 @@ function form_group($legend, $group, $description = NULL) {
 }
 
 function form_radio($title, $name, $value = 1, $checked = 0, $description = NULL, $attributes = NULL) {
-  return theme("form_element", 0, "<input type=\"radio\" class=\"form-radio\" name=\"edit[$name]\" id=\"$name\" value=\"$value\"". ($checked ? " checked=\"checked\"" : "") . drupal_attributes($attributes) ." /> $title", $description, $name);
+  return theme("form_element", 0, "<input type=\"radio\" class=\"form-radio\" name=\"edit[$name]\" value=\"$value\"". ($checked ? " checked=\"checked\"" : "") . drupal_attributes($attributes) ." /> $title", $description);
 }
 
 function form_radios($title, $name, $value, $options, $description = NULL) {
@@ -738,12 +738,12 @@ function form_radios($title, $name, $value, $options, $description = NULL) {
     foreach ($options as $key => $choice) {
       $choices .= "<input type=\"radio\" class=\"form-radio\" name=\"edit[$name]\" value=\"$key\"". ($key == $value ? " checked=\"checked\"" : "") ." /> $choice<br />";
     }
-    return theme("form_element", $title, $choices, $description, $name);
+    return theme("form_element", $title, $choices, $description);
   }
 }
 
 function form_checkbox($title, $name, $value = 1, $checked = 0, $description = NULL, $attributes = NULL) {
-  return form_hidden($name, 0) . theme("form_element", NULL, "<input type=\"checkbox\" class=\"form-checkbox\" name=\"edit[$name]\" value=\"". $value ."\"". ($checked ? " checked=\"checked\"" : "") . drupal_attributes($attributes) ." /> $title", $description, $name);
+  return form_hidden($name, 0) . theme("form_element", NULL, "<input type=\"checkbox\" class=\"form-checkbox\" name=\"edit[$name]\" value=\"". $value ."\"". ($checked ? " checked=\"checked\"" : "") . drupal_attributes($attributes) ." /> $title", $description);
 }
 
 function form_textfield($title, $name, $value, $size, $maxlength, $description = NULL, $attributes = NULL) {