Welcome email message creation fixed