more improve for usernamepassword bug