added additional conditionals for email addresses.