Roles appear twice on User Create and Edit forms

Problem/Motivation

Roles appear twice on the User Edit and Create forms.
The primary Account Roles include roles that the user does not have grant permission for.
This allows the administrator to assign elevated roles.

Steps to reproduce

1. Configure module and permissions
2. Try to create a user - Roles appear that should not
3. Try to edit a user - Roles appear that should not

Proposed resolution

Either the main Account Roles should be altered to exclude roles not assigned,
or it should be removed entirely.

Please see image included.