Modified email addressing issues