Removed nonce generation at the point of email sending (fixed user differences)