Fix previous shoddy attempt to set the EXPIRATION_DATE.
Also, on advice reduce the expiration period to two weeks.

Submitted by: mat