Part 3 of Authorized Users - bug fixes