Further config changes - split system properties into the basic unchging
stuff and those that vary depending on auth state.