Support userid only fixes #9