diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 7a6889f9cff..20242c97c9a 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -3312,7 +3312,7 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa
     }
 
     if ($reply) {
-        $commands[] = array('url'=>new moodle_url('/mod/forum/post.php', array('reply'=>$post->id)), 'text'=>$str->reply);
+        $commands[] = array('url'=>new moodle_url('/mod/forum/post.php#mform1', array('reply'=>$post->id)), 'text'=>$str->reply);
     }
 
     if ($CFG->enableportfolios && ($cm->cache->caps['mod/forum:exportpost'] || ($ownpost && $cm->cache->caps['mod/forum:exportownpost']))) {
diff --git a/mod/forum/post.php b/mod/forum/post.php
index 6e170e6743d..50a771a8f62 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -526,8 +526,10 @@ if ($USER->id != $post->userid) {   // Not the original author, so add a message
     }
 }
 
+$formheading = '';
 if (!empty($parent)) {
     $heading = get_string("yourreply", "forum");
+    $formheading = get_string('reply', 'forum');
 } else {
     if ($forum->type == 'qanda') {
         $heading = get_string('yournewquestion', 'forum');
@@ -875,6 +877,9 @@ if (!empty($parent)) {
     }
 }
 
+if (!empty($formheading)) {
+    echo $OUTPUT->heading($formheading, 2, array('class' => 'accesshide'));
+}
 $mform_post->display();
 
 echo $OUTPUT->footer();