24632 - Pick n Save - New Design/Template for Welcome Email: revert of revert + proper fixes for the first name and date.