--- a/src/pyams_content/features/header/zmi/__init__.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/features/header/zmi/__init__.py	Fri Jun 08 10:33:23 2018 +0200
@@ -29,7 +29,7 @@
 from z3c.form.interfaces import INPUT_MODE
 
 # import packages
-from pyams_form.form import AJAXEditForm
+from pyams_form.form import ajax_config
 from pyams_form.group import NamedWidgetsGroup
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.viewlet.menu import MenuItem, MenuDivider
@@ -69,6 +69,8 @@
 
 @pagelet_config(name='header-settings.html', context=IHeaderTarget, layer=IPyAMSLayer,
                 permission=MANAGE_TEMPLATE_PERMISSION)
+@ajax_config(name='header-settings.json', context=IHeaderTarget, layer=IPyAMSLayer,
+             permission=MANAGE_TEMPLATE_PERMISSION)
 @implementer(IWidgetForm, IInnerPage)
 class HeaderSettingsEditForm(AdminEditForm):
     """Header settings edit form"""
@@ -98,8 +100,6 @@
         else:
             return button.Buttons(Interface)
 
-    ajax_handler = 'header-settings.json'
-
     def updateGroups(self):
         if self.getContent().can_inherit:
             group = NamedWidgetsGroup(self, 'header', self.widgets,
@@ -116,14 +116,8 @@
         self.add_group(group)
         super(HeaderSettingsEditForm, self).updateGroups()
 
-
-@view_config(name='header-settings.json', context=IHeaderTarget, request_type=IPyAMSLayer,
-             permission=MANAGE_TEMPLATE_PERMISSION, renderer='json', xhr=True)
-class HeaderSettingsAJAXEditForm(AJAXEditForm, HeaderSettingsEditForm):
-    """Header settings edit form, JSON renderer"""
-
     def get_ajax_output(self, changes):
-        output = super(HeaderSettingsAJAXEditForm, self).get_ajax_output(changes) or {}
+        output = super(self.__class__, self).get_ajax_output(changes) or {}
         if 'no_inherit' in changes.get(IInheritInfo, ()):
             output['status'] = 'reload'
         return output
@@ -170,7 +164,7 @@
                 context=(IHeaderRendererSettings, IPyAMSLayer, HeaderSettingsRendererEditSubform),
                 provides=IInnerSubForm)
 @adapter_config(name='header-renderer-settings-form',
-                context=(IHeaderTarget, IPyAMSLayer, HeaderSettingsAJAXEditForm),
+                context=(IHeaderTarget, IPyAMSLayer, HeaderSettingsEditForm),
                 provides=IInnerSubForm)
 class HeaderSettingsRendererSettingsEditForm(InnerAdminEditForm):
     """Header settings renderer settings edit form"""