ensure that user events are identified with the correct type (issue #5200)