Fix expiry date handling for users.