Added and fixed Usermanager