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