Bug#5458 Fix update and create poll time