User entity fix2