Index: comments-popup.php
===================================================================
--- comments-popup.php	(revision 11421)
+++ comments-popup.php	(working copy)
@@ -92,8 +92,8 @@
 	  <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
 	  <input type="hidden" name="redirect_to" value="<?php echo esc_attr($_SERVER["REQUEST_URI"]); ?>" />
 	  <input name="submit" type="submit" tabindex="5" value="<?php esc_attr_e("Say It!"); ?>" />
+      	<?php do_action('comment_form', $post->ID); ?>
 	</p>
-	<?php do_action('comment_form', $post->ID); ?>
 </form>
 <?php } else { // comments are closed ?>
 <p><?php _e("Sorry, the comment form is closed at this time."); ?></p>
Index: comments.php
===================================================================
--- comments.php	(revision 11421)
+++ comments.php	(working copy)
@@ -70,9 +70,8 @@
 
 <p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php esc_attr_e('Submit Comment'); ?>" />
 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-</p>
 <?php do_action('comment_form', $post->ID); ?>
-
+</p>
 </form>
 
 <?php endif; // If registration required and not logged in ?>