Fix problem with esx credentials. closes #2503