JOJ-57 Fix bug on submit page
Merge remote-tracking branch 'remotes/origin/JOJ-57'
Merge remote-tracking branch 'origin/master'