fixes #2549 - new host organization and location should default to current context if it exists