Revert "Huge improvement to User and Role manager"

This reverts commit 9031b23e911a598ddca5c409a771f2391088a149.