They wont always match due to the employer making the contributions a month in arrears...don't make any additional entries on the 8889 unless the employee made contributions outside of payroll.

Just mark the Self or Family boxes in that smart worksheet near the top of the 8889 and your errors will disappear.