Fix error with how the action sets up auxiliary fields closes #4156

@bwspenc
Thanks, I didn't think of that. It's on my to do-list to change this part anyway to avoid duplicating a lot of code for the three cases I, II and III, so I'd like to just leave it like this for now.