Added conditional for email address.

updated version.