diff --git a/phpBB/phpbb/mention/source/base_user.php b/phpBB/phpbb/mention/source/base_user.php
index 40e42947b4..e002840614 100644
--- a/phpBB/phpbb/mention/source/base_user.php
+++ b/phpBB/phpbb/mention/source/base_user.php
@@ -124,14 +124,14 @@ abstract class base_user implements source_interface
 
 		foreach ($users as $user)
 		{
-			$user_rank = $this->user_loader->get_rank($user['user_id'], true);
+			$user_rank = $this->user_loader->get_rank($user['user_id']);
 			array_push($names, [
-				'name'		=> $user['username'],
+				'name'		=> $this->user_loader->get_username($user['user_id'], 'username'),
 				'type'		=> 'u',
 				'id'		=> $user['user_id'],
 				'avatar'	=> [
 					'type'	=> 'user',
-					'img'	=> $this->user_loader->get_avatar($user['user_id'], true),
+					'img'	=> $this->user_loader->get_avatar($user['user_id']),
 				],
 				'rank'		=> (isset($user_rank['rank_title'])) ? $user_rank['rank_title'] : '',
 				'priority'	=> $this->get_priority($user),
diff --git a/phpBB/phpbb/mention/source/friend.php b/phpBB/phpbb/mention/source/friend.php
index dfd90a813c..f68bea175a 100644
--- a/phpBB/phpbb/mention/source/friend.php
+++ b/phpBB/phpbb/mention/source/friend.php
@@ -39,7 +39,7 @@ class friend extends base_user
 		 * Results will be cached on a per-user basis
 		 */
 		$query = $this->db->sql_build_query('SELECT', [
-			'SELECT'    => 'u.username_clean, u.username, u.user_id',
+			'SELECT'    => 'u.username_clean, u.user_id',
 			'FROM'      => [
 				USERS_TABLE => 'u',
 			],
diff --git a/phpBB/phpbb/mention/source/team.php b/phpBB/phpbb/mention/source/team.php
index ab59cc7733..481fd1a132 100644
--- a/phpBB/phpbb/mention/source/team.php
+++ b/phpBB/phpbb/mention/source/team.php
@@ -29,7 +29,7 @@ class team extends base_user
 		 * Results will be cached in a single file
 		 */
 		$query = $this->db->sql_build_query('SELECT_DISTINCT', [
-			'SELECT'    => 'u.username_clean, u.username, u.user_id',
+			'SELECT'    => 'u.username_clean, u.user_id',
 			'FROM'      => [
 				USERS_TABLE => 'u',
 				USER_GROUP_TABLE => 'ug',
diff --git a/phpBB/phpbb/mention/source/topic.php b/phpBB/phpbb/mention/source/topic.php
index c1b78542c8..5418e4af85 100644
--- a/phpBB/phpbb/mention/source/topic.php
+++ b/phpBB/phpbb/mention/source/topic.php
@@ -46,7 +46,7 @@ class topic extends base_user
 		 * Results will be cached on a per-topic basis
 		 */
 		$query = $this->db->sql_build_query('SELECT', [
-			'SELECT'    => 'u.username_clean, u.username, u.user_id, t.topic_poster',
+			'SELECT'    => 'u.username_clean, u.user_id, t.topic_poster',
 			'FROM'      => [
 				USERS_TABLE => 'u',
 			],
diff --git a/phpBB/phpbb/mention/source/user.php b/phpBB/phpbb/mention/source/user.php
index dedafd7d24..57f1a23eab 100644
--- a/phpBB/phpbb/mention/source/user.php
+++ b/phpBB/phpbb/mention/source/user.php
@@ -35,7 +35,7 @@ class user extends base_user
 	protected function query($keyword, $topic_id)
 	{
 		$query = $this->db->sql_build_query('SELECT', [
-			'SELECT'    => 'u.username_clean, u.username, u.user_id',
+			'SELECT'    => 'u.username_clean, u.user_id',
 			'FROM'      => [
 				USERS_TABLE => 'u',
 			],