NR-645 : Users can't be assigned roles

NR-644 : Change User management according to design