I don't think I can fix this because PasswordMaker has no way of knowing which field really is the username. It's taking educated guesses.