diff --git a/serendipity_event_contactform/ChangeLog b/serendipity_event_contactform/ChangeLog
index 3f067680..e323773a 100644
--- a/serendipity_event_contactform/ChangeLog
+++ b/serendipity_event_contactform/ChangeLog
@@ -1,3 +1,7 @@
+1.21
+-----
+  * Reset content message, as also needed in staticpage plugin.
+
 1.20
 -----
  * change xhtml to html for case: radio, checkbox and select
diff --git a/serendipity_event_contactform/serendipity_event_contactform.php b/serendipity_event_contactform/serendipity_event_contactform.php
index 2aad2bd6..863636b2 100644
--- a/serendipity_event_contactform/serendipity_event_contactform.php
+++ b/serendipity_event_contactform/serendipity_event_contactform.php
@@ -29,7 +29,7 @@ class serendipity_event_contactform extends serendipity_event {
         $propbag->add('event_hooks',  array('entries_header' => true, 'entry_display' => true, 'genpage' => true));
         $propbag->add('configuration', array('permalink', 'pagetitle', 'backend_title', 'email', 'subject', 'counter', 'intro', 'sent', 'articleformat', 'dynamic_tpl', 'dynamic_fields', 'dynamic_fields_tpl', 'dynamic_fields_desc'));
         $propbag->add('author', 'Garvin Hicking');
-        $propbag->add('version', '1.20');
+        $propbag->add('version', '1.21');
         $propbag->add('requirements',  array(
             'serendipity' => '1.3',
             'smarty'      => '2.6.7',
@@ -366,6 +366,8 @@ class serendipity_event_contactform extends serendipity_event {
 
     function show() {
         global $serendipity;
+        
+        $serendipity['content_message'] = ''; // Reset message for 404 error handling which is now overriden
 
         if ($this->selected()) {
             $form_fields = array();