Fix UserName and PassWord hard-coded
Fix conflict pull request