Bug 686620 - Add an option to skip New Account autodiscovery