added usertypes and fixed edit user