Fix #2078: User manager regression from #2061
Merge pull request #2079 from mahagr/master

Fix #2078: User manager regression from #2061