diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
index 4ef1c54dbab..ca03167195f 100644
--- a/mod/forum/lang/en/forum.php
+++ b/mod/forum/lang/en/forum.php
@@ -131,8 +131,8 @@ $string['discussion'] = 'Discussion';
 $string['discussionmoved'] = 'This discussion has been moved to \'{$a}\'.';
 $string['discussionmovedpost'] = 'This discussion has been moved to <a href="{$a->discusshref}">here</a> in the forum <a href="{$a->forumhref}">{$a->forumname}</a>';
 $string['discussionname'] = 'Discussion name';
-$string['discussionnownotsubscribed'] = '{$a->name} will NOT be notified of new posts in \'{$a->name}\' of \'{$a->forum}\'';
-$string['discussionnowsubscribed'] = '{$a->name} will be notified of new posts in \'{$a->name}\' of \'{$a->forum}\'';
+$string['discussionnownotsubscribed'] = '{$a->name} will NOT be notified of new posts in \'{$a->discussion}\' of \'{$a->forum}\'';
+$string['discussionnowsubscribed'] = '{$a->name} will be notified of new posts in \'{$a->discussion}\' of \'{$a->forum}\'';
 $string['discussionsubscribestop'] = 'I don\'t want email copies of posts to this discussion';
 $string['discussionsubscribestart'] = 'Send me email copies of posts to this discussion';
 $string['discussionsubscription'] = 'Discussion subscription';
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 1ecd6c33623..bdd9f8ad7b0 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -4654,15 +4654,16 @@ function forum_post_subscription($fromform, $forum, $discussion) {
 
     $info = new stdClass();
     $info->name  = fullname($USER);
+    $info->discussion = format_string($discussion->name);
     $info->forum = format_string($forum->name);
 
     if ($fromform->discussionsubscribe) {
         if ($result = \mod_forum\subscriptions::subscribe_user_to_discussion($USER->id, $discussion)) {
-            return html_writer::tag('p', get_string('nowsubscribed', 'forum', $info));
+            return html_writer::tag('p', get_string('discussionnowsubscribed', 'forum', $info));
         }
     } else {
         if ($result = \mod_forum\subscriptions::unsubscribe_user_from_discussion($USER->id, $discussion)) {
-            return html_writer::tag('p', get_string('nownotsubscribed', 'forum', $info));
+            return html_writer::tag('p', get_string('discussionnownotsubscribed', 'forum', $info));
         }
     }
 
diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
index b55616ac8c1..41658bf39f2 100644
--- a/mod/forum/subscribe.php
+++ b/mod/forum/subscribe.php
@@ -162,7 +162,7 @@ if (\mod_forum\subscriptions::is_subscribed($user->id, $forum, $discussionid, $c
     } else {
         $discussion = $DB->get_record('forum_discussions', array('id' => $discussionid));
         if (\mod_forum\subscriptions::unsubscribe_user_from_discussion($user->id, $discussion, $context)) {
-            $info->name = $discussion->name;
+            $info->discussion = $discussion->name;
             redirect($returnto, get_string("discussionnownotsubscribed", "forum", $info), 1);
         } else {
             print_error('cannotunsubscribe', 'forum', $_SERVER["HTTP_REFERER"]);
@@ -191,7 +191,7 @@ if (\mod_forum\subscriptions::is_subscribed($user->id, $forum, $discussionid, $c
         redirect($returnto, get_string("nowsubscribed", "forum", $info), 1);
     } else {
         $discussion = $DB->get_record('forum_discussions', array('id' => $discussionid));
-        $info->name = $discussion->name;
+        $info->discussion = $discussion->name;
         \mod_forum\subscriptions::subscribe_user_to_discussion($user->id, $discussion, $context);
         redirect($returnto, get_string("discussionnowsubscribed", "forum", $info), 1);
     }