Index: comment-template.php
===================================================================
--- comment-template.php	(revision 17522)
+++ comment-template.php	(working copy)
@@ -1057,9 +1057,18 @@
 	$link = '';
 
 	if ( get_option('comment_registration') && !$user_ID )
-		$link = '<a rel="nofollow" class="comment-reply-login" href="' . esc_url( wp_login_url( get_permalink() ) ) . '">' . $login_text . '</a>';
+		$link = '<form action="'.  esc_url(wp_login_url()) .'" method="get">'.
+		        '<button class="comment-reply-login" value="'.
+		        esc_url(get_permalink()) .'" type="submit" name="redirect_to">'.
+		        $login_text .'</button></form>';
 	else
-		$link = "<a class='comment-reply-link' href='" . esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
+		$link = '<form action="#'. $respond_id .'" method="get">'.
+		        '<button class="comment-reply-link" value="'.
+		        $comment->comment_ID .'" onclick="return addComment.moveForm(\''.
+		        $add_below .'-'. $comment->comment_ID .'\', \''.
+		        $comment->comment_ID .'\', \''. $respond_id .'\', \''. $post->ID.
+		        '\')" type="submit" name="replytocom">'.
+		        $reply_text .'</button></form>';
 	return apply_filters('comment_reply_link', $before . $link . $after, $args, $comment, $post);
 }