Fixes #7491 - moved default org and default location to same tab as org/...

...loc selection
for non admins, I am guessing this should only show the selected taxonomies, rather then the one in the db?