diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 347da3181e..75e76b157d 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -46,7 +46,9 @@
 						<div class="dropdown hidden">
 							<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" >
 								{% for role in loops.role_options %}
+									{% if role.UG_ID == p_mask.f_mask.UG_ID %}
 									<li data-id="{{ role.ID }}" data-target-id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" data-title="{{ role.TITLE }}"{% if role.SELECTED == true %} data-selected="{{ role.SELECTED }}"{% endif %}>{{ role.ROLE_NAME }}</li>
+									{% endif %}
 								{% endfor %}
 							</ul>
 						</div>
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index 11478842d7..a3972158a2 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -477,6 +477,7 @@ class auth_admin extends \phpbb\auth\auth
 
 						$template->assign_block_vars('role_options', array(
 							'ID'	=> $role_id,
+							'UG_ID'	=> $ug_id,
 							'ROLE_NAME'	=> $role_name,
 							'TITLE'		=> $role_description,
 							'SELECTED'	=> $role_id == $current_role_id,