Issue #3236446 by paulocs, benjifisher: Avoid duplicated code for the Modules form and the Modules Confirmation form