Fix for bug 2155: duplicate checkin box on returns screen