Make sure we're using the new account system everywhere

Fixes #22