1619 | Subhas | Fix credentials
Merge pull request #389 from rdsubhas/master

1619 | Subhas | Minor fixes