LPS-31235

Current logic will not set 

    hasCustomQuestion = false;

because we completely skip the original JSP.