Dc/Melanie |#3756 | Fixing undefined on web submission