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

...loc selection
Yeah, though I thought this way in erb file it looks cleaner.