Usermanager bug fix

see commit comments