[enhancement] switched email template resolving to best practice