Fix issues with user confirmed field on update