Fixed multi-account support