fixed an accidental merge issue, and updated mailman code to use user_pool api