diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js
index 3514c09ed5..d6287f5e49 100644
--- a/phpBB/assets/javascript/editor.js
+++ b/phpBB/assets/javascript/editor.js
@@ -402,7 +402,8 @@ function getCaretPosition(txtarea) {
 			$(txtarea).atwho({
 				at: "@",
 				displayTpl: function(data) {
-					let avatar = (data.avatar.src) ? "<img src='" + data.avatar.src + "' class='mention-media-avatar'>" : defaultAvatar(data.avatar.type),
+					// TODO: handle image scaling
+					let avatar = (data.avatar.img) ? "<span class='mention-media-avatar'>" + data.avatar.img + "</span>" : defaultAvatar(data.avatar.type),
 						rank = (data.rank) ? "<span class='mention-rank'>" + data.rank + "</span>" : '';
 					return "<li class='mention-item'><span class='mention-media'>" + avatar + "</span><span class='mention-name'>" + data.name + rank + "</span></li>";
 				},
@@ -410,7 +411,8 @@ function getCaretPosition(txtarea) {
 				limit: mentionNamesLimit,
 				callbacks: {
 					remoteFilter: function(query, callback) {
-						$.getJSON(mentionURL, {keyword: query, topic_id: mentionTopicId}, function (data) {
+						let params = {keyword: query, topic_id: mentionTopicId, _referer: location.href};
+						$.getJSON(mentionURL, params, function (data) {
 							callback(data)
 						});
 					}
diff --git a/phpBB/phpbb/mention/source/base_group.php b/phpBB/phpbb/mention/source/base_group.php
index da1acc6689..644119ecd9 100644
--- a/phpBB/phpbb/mention/source/base_group.php
+++ b/phpBB/phpbb/mention/source/base_group.php
@@ -137,7 +137,7 @@ abstract class base_group implements source_interface
 				'id'		=> $group_id,
 				'avatar'	=> [
 					'type'	=> 'group',
-					'src'	=> phpbb_get_group_avatar($groups[$group_id]),
+					'img'	=> phpbb_get_group_avatar($groups[$group_id]),
 				],
 				'rank'		=> $group_rank['title'],
 			];
diff --git a/phpBB/phpbb/mention/source/base_user.php b/phpBB/phpbb/mention/source/base_user.php
index bc1bcc0053..804c20c14d 100644
--- a/phpBB/phpbb/mention/source/base_user.php
+++ b/phpBB/phpbb/mention/source/base_user.php
@@ -74,7 +74,7 @@ abstract class base_user implements source_interface
 				'id'		=> $row['user_id'],
 				'avatar'	=> [
 					'type'	=> 'user',
-					'src'	=> $this->user_loader->get_avatar($row['user_id'], true),
+					'img'	=> $this->user_loader->get_avatar($row['user_id'], true),
 				],
 				'rank'		=> (isset($user_rank['rank_title'])) ? $user_rank['rank_title'] : '',
 			];