Improve a few more case-sensitive uses of emails [MJ-315]