Support deprecated pricing on account page

https://trello.com/c/Cl6H6nIU/378-update-pricing

We introduced new pricing which didn't display correctly on the account page. This change fixes the issues.
Yea, I think that's cleaner.