fixing error in automatic population of env vars using client info