change the way expire is set
fix for date on edit form