#465 - Integrate User and Roles