Changes to fix userself service