Auto-accept now working for returns