Some email changes after moving to custom domain