Update to use user token instead user key