diff --git a/public/src/client/flags/list.js b/public/src/client/flags/list.js
index a1615f3828..d3b20b04fb 100644
--- a/public/src/client/flags/list.js
+++ b/public/src/client/flags/list.js
@@ -43,7 +43,8 @@ define('forum/flags/list', [
 			const filterEl = $(`[component="flags/filter/${filter}"]`);
 			userFilter.init(filterEl, {
 				selectedUsers: selected.get(filter),
-				template: 'partials/search-filters',
+				template: 'partials/flags/filters',
+				selectedBlock: 'selected.assignee',
 				onSelect: function (_selectedUsers) {
 					selected.set(filter, _selectedUsers);
 				},
diff --git a/public/src/modules/userFilter.js b/public/src/modules/userFilter.js
index fae9c1bbc8..d63823b04d 100644
--- a/public/src/modules/userFilter.js
+++ b/public/src/modules/userFilter.js
@@ -16,9 +16,16 @@ define('userFilter', ['api', 'hooks', 'slugify'], function (api, hooks, slugify)
 		hooks.fire('action:user.filter.options', { el: el, options: options });
 
 		async function renderSelectedUsers() {
-			const html = await app.parseAndTranslate(options.template, 'userFilterSelected', {
-				userFilterSelected: selectedUsers,
-			});
+			const block = options.selectedBlock || 'userFilterSelected';
+			const payload = {};
+			if (block.indexOf('.') !== -1) {
+				const split = block.split('.');
+				payload[split[0]] = {};
+				payload[split[0]][split[1]] = selectedUsers;
+			} else {
+				payload[block] = selectedUsers;
+			}
+			const html = await app.parseAndTranslate(options.template, block, payload);
 			el.find('[component="user/filter/selected"]').html(html);
 		}