Added replacements in mail and better control of user mails