Fixed expiration date setting being replaced by hardcoded setting