bugfixes for non pa accounts