make update/create/fetch user work more reliably