Bug fix for duplicate AccountWatcher callbacks

True - I could. Will do.