updated with user mapping and sf users mail fallback