users.patch - sync with upstream