3.16: optionally allow account overrides