- Fix issue with null user id