User the new AES encryptor for new accounts.
Merge pull request #279 from eric-wu/develop

User the new AES encryptor for new accounts