Various account fixes

closes #451