Added sameUserError and updated refund