fixing contact form with client code
Merge branch 'stage'