Fixes for user id and multi tenacity