Bug fix for duplicate AccountWatcher callbacks

Should you `break` here?