changes in usermatch()