* added extra checking to on_account_inserted, on_account_changed.