[Fix Bug 881852] Improvements/fixes to multi-account code