diff --git a/themes/openpowerfoundation/assets/js/form.js b/themes/openpowerfoundation/assets/js/form.js
index 44fcb67..f0aa725 100644
--- a/themes/openpowerfoundation/assets/js/form.js
+++ b/themes/openpowerfoundation/assets/js/form.js
@@ -85,10 +85,15 @@ jQuery(document).ready(function($) {
 				complete: function() {
 					$("#sendmessage").addClass("show");
 					$("#errormessage").removeClass("show");
-					$('.contactForm').find("input, textarea").val("");
-					if(goal) {
+					$(formname)[0].reset();
+					$('input[type="text"],textarea').val('');
+					if(typeof goal !== 'undefined') {
 						_paq.push(['trackGoal', goal]);
 					}
+					$('#sendmessage').show();
+					setTimeout(function() {
+						$('#sendmessage').fadeOut();
+					}, 2500);
 				}
 			});
 			return false;