Minor add-user/role related fixes