even more fixes for usermatch()