Fixes #7491 - moved default org and default location to same tab as org/loc selection
refs #2127 - instantiate exception and pass i18n arg correctly