Tweak to deal with a problem resending emails

Somehow, the IdentityLink wound up as Optional.None in a bunch of
people.  That is weird and distressing.  Made things more tolerant of
that.