Usermanagement fixes