Move role selector to account group if it exists

Closes #3567638

Merge request reports

Loading