Minor: fixed and enhanced user role management