remove most uses of find_user_by_email