This fixes #7597.  It now has a selection box for Role.