Fixing bug related to user name and password