(hopefully) fix multiple accounts issue
Summary
Fixes #1672 (closed).
May (!) cause issues with stale pubkeys but testing didn't reveal any issues. More investigation needed but should mostly be safe to merge.
Fixes #1672 (closed).
May (!) cause issues with stale pubkeys but testing didn't reveal any issues. More investigation needed but should mostly be safe to merge.