I wonder if we should refactor the smtp configuration thing so we can put this default elsewhere?