improvements in usermanagement but not finished