Contact Form Fix [MS-963] [MJ-810]

All Tests Pass