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

...loc selection
I would prefer not to have it in the default template (that is used my all other objects), maybe we should break down the org and locations to two different partials, and then render them directly in the user form?