Fix user2user principal (again)