Prevent creation of staged user for emails with auto-xyz header

See my question here: