Add support for Email inputfield