Last tweak for the user service