JOJ-57 Fix bug on submit page