diff --git a/plone/app/discussion/browser/controlpanel.py b/plone/app/discussion/browser/controlpanel.py
index cb790f8..7b84760 100644
--- a/plone/app/discussion/browser/controlpanel.py
+++ b/plone/app/discussion/browser/controlpanel.py
@@ -29,6 +29,7 @@ class DiscussionSettingsEditForm(controlpanel.RegistryEditForm):
     """Discussion settings form.
     """
     schema = IDiscussionSettings
+    id = "DiscussionSettingsEditForm"
     label = _(u"Discussion settings")
     description = _(u"help_discussion_settings_editform",
                     default=u"Some discussion related settings are not located "
@@ -65,9 +66,10 @@ class DiscussionSettingsEditForm(controlpanel.RegistryEditForm):
             _(u"Moderator Email Notification")
         self.widgets['user_notification_enabled'].label = \
             _(u"User Email Notification")
-
-    @button.buttonAndHandler(_('Save'), name='save')
+        
+    @button.buttonAndHandler(_('Save'), name=None)
     def handleSave(self, action):
+        print "handleSave"
         data, errors = self.extractData()
         if errors:
             self.status = self.formErrorsMessage
diff --git a/plone/app/discussion/browser/javascripts/controlpanel.js b/plone/app/discussion/browser/javascripts/controlpanel.js
index d1fc2ce..19f5898 100644
--- a/plone/app/discussion/browser/javascripts/controlpanel.js
+++ b/plone/app/discussion/browser/javascripts/controlpanel.js
@@ -118,12 +118,10 @@
          * submitting the form. Otherwise the z3c.form will raise errors on
          * the required attributes.
          **********************************************************************/
-        $("input[name='form.buttons.save']").bind("click", function (e) {
-            e.preventDefault();
-            var form = $(this).parents("form");
-            $(form).find("input,select").removeAttr('disabled');
-            $(form).submit();
-        });           
+        $("form#DiscussionSettingsEditForm").bind("submit", function (e) {
+            $(this).find("input,select").removeAttr('disabled');
+			$(this).submit();
+        });
         
     });