diff --git a/includes/comment.inc b/includes/comment.inc
index 7cb59c7819ee692001f15d82c7d8308e2bdbe34e..68b4ae977e9d07ecdbce71d32712be17b4a4fd02 100644
--- a/includes/comment.inc
+++ b/includes/comment.inc
@@ -63,8 +63,7 @@ function comment_form($edit) {
   $form .= form_hidden("pid", check_input($edit[pid]));
   $form .= form_hidden("id", check_input($edit[id]));
 
-  if (empty($edit[subject])) {
-    $form .= "<FONT COLOR=\"red\">". t("Warning: you did not supply a subject.") ."</FONT><P>\n";
+  if (!$edit[comment]) {
     $form .= form_submit(t("Preview comment"));
   }
   else {
@@ -72,7 +71,7 @@ function comment_form($edit) {
     $form .= form_submit(t("Post comment"));
   }
 
-  return form($REQUEST_URL, $form);
+  return form($REQUEST_URI, $form);
 }
 
 function comment_reply($pid, $id) {