Improved ticket verification on create and update