Added multitenant changes to user.js