E806

This is a continuation of [this pull request](https://github.com/expertiza/expertiza/pull/375).