Don't use email and uuid

This refs affinitic #5889