Changed to standard "Email" naming convention
Removed input wrapped in anchor
Updated to proper input escapes