diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index aff7129fce..32206df868 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2604,9 +2604,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	// Send Notifications
 	if (($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_approval)
 	{
-		// If a username was supplied or the poster is a guest, we use the supplied username.
-		// This way we will use "...post by guest-username..." in notifications,
-		// when guest-username was supplied and ommit the username-part otherwise.
+		// If a username was supplied or the poster is a guest, we will use the supplied username.
+		// Doing it this way we can use "...post by guest-username..." in notifications when
+		// "guest-username" is supplied or ommit the username if it is not.
 		$username = ($username || !$user->data['is_registered']) ? $username : $user->data['username'];
 		user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id'], $username);
 	}
diff --git a/phpBB/posting.php b/phpBB/posting.php
index d690445fdb..7ab4773df2 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1131,9 +1131,10 @@ if ($submit || $preview || $refresh)
 				$data['topic_replies'] = $post_data['topic_replies'];
 			}
 
-			// Only supply the username, when it is a guest posting or we edit and it was supplied,
-			// otherwise post_data might hold data of the post we quote, in which case
-			// username is the original poster, not the current one. See: PHPBB3-11769
+			// Only return the username when it is either a guest posting or we are editing a post and
+			// the username was supplied; otherwise post_data might hold the data of the post that is
+			// being quoted (which could result in the username being returned being that of the quoted
+			// post's poster, not the poster of the current post). See: PHPBB3-11769 for more information.
 			$post_author_name = ((!$user->data['is_registered'] || $mode == 'edit') && $post_data['username']) ? $post_data['username'] : '';
 
 			// The last parameter tells submit_post if search indexer has to be run