Fix bug 1088787 - Simplify verified event