Updated Security and Email management