Email template fixes