UC-53 Make sure we forward to the right template name