Account fixes

Closes #439
Closes #443