Check context and context id as before.
Merge pull request #1375 from reciprocity/audit-lhn-context-fix

Check context and context id as before.