diff --git a/django/contrib/comments/templates/comments/approve.html b/django/contrib/comments/templates/comments/approve.html
index af7858da639..e07f74eedfd 100644
--- a/django/contrib/comments/templates/comments/approve.html
+++ b/django/contrib/comments/templates/comments/approve.html
@@ -6,9 +6,9 @@
   <h1>Really make this comment public?</h1>
   <blockquote>{{ comment|linebreaks }}</blockquote>
   <form action="." method="post">
-    <input type="hidden" name="next" value="{{ next }}" id="next">
+    <input type="hidden" name="next" value="{{ next }}" id="next" />
     <p class="submit">
-      <input type="submit" name="submit" value="Approve"> or <a href="{{ comment.permalink }}">cancel</a>
+      <input type="submit" name="submit" value="Approve" /> or <a href="{{ comment.permalink }}">cancel</a>
     </p>
   </form>
 {% endblock %}
diff --git a/django/contrib/comments/templates/comments/delete.html b/django/contrib/comments/templates/comments/delete.html
index 148fcdec90d..917a638bc3c 100644
--- a/django/contrib/comments/templates/comments/delete.html
+++ b/django/contrib/comments/templates/comments/delete.html
@@ -6,9 +6,9 @@
   <h1>Really remove this comment?</h1>
   <blockquote>{{ comment|linebreaks }}</blockquote>
   <form action="." method="post">
-    <input type="hidden" name="next" value="{{ next }}" id="next">
+    <input type="hidden" name="next" value="{{ next }}" id="next" />
     <p class="submit">
-      <input type="submit" name="submit" value="Remove"> or <a href="{{ comment.permalink }}">cancel</a>
+      <input type="submit" name="submit" value="Remove" /> or <a href="{{ comment.permalink }}">cancel</a>
     </p>
   </form>
 {% endblock %}
diff --git a/django/contrib/comments/templates/comments/flag.html b/django/contrib/comments/templates/comments/flag.html
index b6905f2915b..9f694773a27 100644
--- a/django/contrib/comments/templates/comments/flag.html
+++ b/django/contrib/comments/templates/comments/flag.html
@@ -6,9 +6,9 @@
   <h1>Really flag this comment?</h1>
   <blockquote>{{ comment|linebreaks }}</blockquote>
   <form action="." method="post">
-    <input type="hidden" name="next" value="{{ next }}" id="next">
+    <input type="hidden" name="next" value="{{ next }}" id="next" />
     <p class="submit">
-      <input type="submit" name="submit" value="Flag"> or <a href="{{ comment.permalink }}">cancel</a>
+      <input type="submit" name="submit" value="Flag" /> or <a href="{{ comment.permalink }}">cancel</a>
     </p>
   </form>
 {% endblock %}
diff --git a/django/contrib/comments/templates/comments/moderation_queue.html b/django/contrib/comments/templates/comments/moderation_queue.html
index 8f09b2f05db..7cb3c62583d 100644
--- a/django/contrib/comments/templates/comments/moderation_queue.html
+++ b/django/contrib/comments/templates/comments/moderation_queue.html
@@ -23,7 +23,7 @@
 
 {% block content %}
 {% if empty %}
-  <p id="nocomments">No comments to moderate.</div>
+  <p id="nocomments">No comments to moderate.</p>
 {% else %}
 <div id="content-main">
   <div class="module" id="changelist">
@@ -45,12 +45,12 @@
         <tr class="{% cycle 'row1' 'row2' %}">
           <td class="actions">
             <form action="{% url comments-approve comment.pk %}" method="post">
-              <input type="hidden" name="next" value="{% url comments-moderation-queue %}">
-              <input class="approve submit" type="submit" name="submit" value="Approve">
+              <input type="hidden" name="next" value="{% url comments-moderation-queue %}" />
+              <input class="approve submit" type="submit" name="submit" value="Approve" />
             </form>
             <form action="{% url comments-delete comment.pk %}" method="post">
-              <input type="hidden" name="next" value="{% url comments-moderation-queue %}">
-              <input class="remove submit" type="submit" name="submit" value="Remove">
+              <input type="hidden" name="next" value="{% url comments-moderation-queue %}" />
+              <input class="remove submit" type="submit" name="submit" value="Remove" />
             </form>
           </td>
           <td>{{ comment.name }}</td>
diff --git a/django/contrib/comments/templates/comments/preview.html b/django/contrib/comments/templates/comments/preview.html
index 0947476865c..273e3735835 100644
--- a/django/contrib/comments/templates/comments/preview.html
+++ b/django/contrib/comments/templates/comments/preview.html
@@ -11,7 +11,7 @@
       <h1>Preview your comment</h1>
       <blockquote>{{ comment|linebreaks }}</blockquote>
       <p>
-        and <input type="submit" name="submit" value="Post your comment" id="submit"> or make changes:
+        and <input type="submit" name="submit" value="Post your comment" id="submit" /> or make changes:
       </p>
     {% endif %}
     {% for field in form %}
@@ -27,8 +27,8 @@
       {% endif %}
     {% endfor %}
     <p class="submit">
-      <input type="submit" name="submit" class="submit-post" value="Post">
-      <input type="submit" name="submit" class="submit-preview" value="Preview">
+      <input type="submit" name="submit" class="submit-post" value="Post" />
+      <input type="submit" name="submit" class="submit-preview" value="Preview" />
     </p>
   </form>
 {% endblock %}