Fixed issues with site messageform

This should be the last issue before release.