diff --git a/modules/comment.module b/modules/comment.module
index c8063cbc0c525ffce6fa1c39203902c79e878af8..a7c8238ef7a4892a3fade0cda1713a0467ff428e 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -1456,6 +1456,10 @@ function comment_form_submit($form_id, $form_values) {
 */
 
 function theme_comment_form($form) {
+  if (!isset($form['#prefix'])) {
+    $form['#prefix'] = '';
+  }
+  $form['#prefix'] .= "<a id=\"comment-form\"></a>\n";
   return form_render($form);
 }
 
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index c8063cbc0c525ffce6fa1c39203902c79e878af8..a7c8238ef7a4892a3fade0cda1713a0467ff428e 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1456,6 +1456,10 @@ function comment_form_submit($form_id, $form_values) {
 */
 
 function theme_comment_form($form) {
+  if (!isset($form['#prefix'])) {
+    $form['#prefix'] = '';
+  }
+  $form['#prefix'] .= "<a id=\"comment-form\"></a>\n";
   return form_render($form);
 }