Deal with account expiry the right way
Merge date formatting.