Fixes non-abstract issue.
Update to where current account comes from.
Moved Error
Update that should fix the encryption logic bug that Paul reported.