More tweaks for User services