Feature #11900, Revise email templates to not be intercepted by MailScanner Invite email template revised to support double step in case of user registration First Release