Follow-up from "Merge branch 'api-events-thaliapp' into 'master'"

The following discussions from !495 (merged) should be addressed:

• @twiggers commented in a discussion on May 31, 2017 10:15pm:

Dit rekent het wel twee keer uit, is dat de bedoeling?