Use the account tag in a few places and store it in the XML file as an attribute, not as a setting (since all accounts have it anyway).
