#1859 + @Machaba-Machaba - Now proper enquiry form will be rendered