Merge "[Bugfix][T106BUG-346] Fix the username and password not taking effect"