Changes to usermanager