updated with support for email fallback