All contributions made via payroll deduction are treated for tax purposes as if they were made by the employer. Box 12 code W should include the total of free money from the employer, plus employee contributions. Your employer is doing it correctly this year and incorrectly last year. Your voluntary contributions should not be included as part of your box 1 wages. (If your voluntary contributions are included in box 1 and box 12, your employer is still doing it wrong.)
Later in the program when you are asked for additional contributions, only list contributions that were made directly to the bank and not through payroll.
