Merge pull request #571 from farismosman/master

[#1875] Adding more fields to enquiry
[#1861] Fixed error message when creating/updating enquiries.