|+807| +Manan|Sanity check in for User screen. Using ngOptions intead of repeating on options
|#807|+Manan| Refactored updating and creation of user roles.