OA-436: Set correct notifiers