Improve email logic
Code protection