In CPUU.ini, there is an option to define the Autodiscover for both Source and Target domains. This is used for Outlook 2016, and environments that use the same namespace for email in both Source and Target Exchange.
You can modify the CPUU_Update.bat file to always use those files, regardless of Outlook version.
Edit CPUU_Update.bat file to include the -AlwaysUseAutodiscoverFiles parameter in the command_line sections:
