Fallback to client email display on user directory
Simplify header detection logic with outdent