Solution for mismatched affs/emails - #624