* fix the issues with account-store and account-mgr: