diff --git a/phpBB/phpbb/mention/source/group.php b/phpBB/phpbb/mention/source/group.php
index cdd3596d75..e74948d402 100644
--- a/phpBB/phpbb/mention/source/group.php
+++ b/phpBB/phpbb/mention/source/group.php
@@ -39,6 +39,7 @@ class group extends base_group
 			'FROM'      => [
 				GROUPS_TABLE => 'g',
 			],
+			'ORDER_BY'	=> 'g.group_name',
 		]);
 		return $query;
 	}
diff --git a/phpBB/phpbb/mention/source/team.php b/phpBB/phpbb/mention/source/team.php
index cf373e8b03..ab59cc7733 100644
--- a/phpBB/phpbb/mention/source/team.php
+++ b/phpBB/phpbb/mention/source/team.php
@@ -37,7 +37,7 @@ class team extends base_user
 			],
 			'WHERE'     => 'ug.group_id = t.group_id AND ug.user_id = u.user_id AND ug.user_pending = 0
 				AND ' . $this->db->sql_in_set('u.user_type', [USER_NORMAL, USER_FOUNDER]),
-			'ORDER_BY'  => 'u.user_lastvisit DESC'
+			'ORDER_BY'  => 'u.username'
 		]);
 		return $query;
 	}
diff --git a/phpBB/phpbb/mention/source/usergroup.php b/phpBB/phpbb/mention/source/usergroup.php
index fd1184ff60..b3b3e71ded 100644
--- a/phpBB/phpbb/mention/source/usergroup.php
+++ b/phpBB/phpbb/mention/source/usergroup.php
@@ -32,6 +32,7 @@ class usergroup extends base_group
 				]
 			],
 			'WHERE'     => 'ug.user_pending = 0 AND ug.user_id = ' . (int) $this->user->data['user_id'],
+			'ORDER_BY'	=> 'g.group_name',
 		]);
 		return $query;
 	}