CLUB-125, extend submit page rather than override it