[RFC] Account Upgrade

Moved the check for require billing setup in the model