Fix problem with esx credentials. clean closes #2503