[#71587328] Updating email mapping function.