Fixing Account Manager to properly validate the account