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

...loc selection
Can you change this label (and the one for organizations) to "Default on login"? 
Since you moved this to the tabs they belong in (thanks!) "Default location" is redundant with the title of the tab, and "Default on login" makes it a bit clearer for users to understand what's this default.