Fixed up user and item on orders return