Improve check_for_master to use find_user