Fix #2078: User manager regression from #2061