Bug fix for duplicate AccountWatcher callbacks