Add support for guest master users