Added account expiration date + bug fixes