User: fixed roles & removed scoping.