--- a/src/pyams_security/zmi/plugin/admin.py	Thu Oct 08 09:30:56 2015 +0200
+++ b/src/pyams_security/zmi/plugin/admin.py	Thu Oct 08 09:31:45 2015 +0200
@@ -12,22 +12,24 @@
 
 __docformat__ = 'restructuredtext'
 
+
 # import standard library
 
 # import interfaces
+from pyams_form.interfaces.form import IFormHelp
 from pyams_security.interfaces import IAdminAuthenticationPlugin, ISecurityManager
-from pyams_skin.interfaces import IContentHelp
 from pyams_skin.interfaces.viewlet import IToolbarAddingMenu
 from pyams_skin.layer import IPyAMSLayer
+from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION, MANAGE_SYSTEM_PERMISSION
 from z3c.form.interfaces import DISPLAY_MODE, IDataExtractedEvent
 from zope.component.interfaces import ISite
 
 # import packages
 from pyams_form.form import AJAXAddForm, AJAXEditForm
+from pyams_form.help import FormHelp
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_security.plugin.admin import AdminAuthenticationPlugin
 from pyams_security.zmi.utility import SecurityManagerPluginsTable
-from pyams_skin.help import ContentHelp
 from pyams_skin.viewlet.toolbar import ToolbarMenuItem
 from pyams_utils.adapter import adapter_config
 from pyams_utils.registry import query_utility
@@ -45,7 +47,7 @@
 
 @viewlet_config(name='add-admin-authentication.menu', context=ISite, layer=IAdminLayer,
                 view=SecurityManagerPluginsTable, manager=IToolbarAddingMenu,
-                permission='system.manage', weight=1)
+                permission=MANAGE_SYSTEM_PERMISSION, weight=1)
 class AdminAuthenticationAddMenu(ToolbarMenuItem):
     """Admin authentication add menu"""
 
@@ -56,7 +58,7 @@
 
 
 @pagelet_config(name='add-admin-authentication.html', context=ISite, layer=IPyAMSLayer,
-                permission='system.manage')
+                permission=MANAGE_SYSTEM_PERMISSION)
 class AdminAuthenticationAddForm(AdminDialogAddForm):
     """Admin authentication plug-in add form"""
 
@@ -67,7 +69,7 @@
     fields = field.Fields(IAdminAuthenticationPlugin).omit('__name__', '__parent__')
     autocomplete = 'off'
     ajax_handler = 'add-admin-authentication.json'
-    edit_permission = 'system.manage'
+    edit_permission = MANAGE_SYSTEM_PERMISSION
 
     def create(self, data):
         return AdminAuthenticationPlugin()
@@ -90,13 +92,13 @@
 
 
 @view_config(name='add-admin-authentication.json', context=ISite, request_type=IPyAMSLayer,
-             permission='system.manage', renderer='json', xhr=True)
+             permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
 class AdminAuthenticationAJAXAddForm(AJAXAddForm, AdminAuthenticationAddForm):
     """Admin authentication plug-in add form, AJAX handler"""
 
 
 @pagelet_config(name='properties.html', context=IAdminAuthenticationPlugin, layer=IPyAMSLayer,
-                permission='system.view')
+                permission=VIEW_SYSTEM_PERMISSION)
 class AdminAuthenticationEditForm(AdminDialogEditForm):
     """Admin authentication plug-in edit form"""
 
@@ -110,7 +112,7 @@
     fields = field.Fields(IAdminAuthenticationPlugin).omit('__name__', '__parent__')
     autocomplete = 'off'
     ajax_handler = 'properties.json'
-    edit_permission = 'system.manage'
+    edit_permission = MANAGE_SYSTEM_PERMISSION
 
     def updateWidgets(self, prefix=None):
         super(AdminAuthenticationEditForm, self).updateWidgets()
@@ -118,13 +120,13 @@
 
 
 @view_config(name='properties.json', context=IAdminAuthenticationPlugin, request_type=IPyAMSLayer,
-             permission='system.manage', renderer='json', xhr=True)
+             permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
 class AdminAuthenticationAJAXEditForm(AJAXEditForm, AdminAuthenticationEditForm):
     """Admin authentication plug-in edit form, AJAX handler"""
 
 
-@adapter_config(context=(IAdminAuthenticationPlugin, IAdminLayer, AdminAuthenticationEditForm), provides=IContentHelp)
-class AdminAuthenticationHelpAdapter(ContentHelp):
+@adapter_config(context=(IAdminAuthenticationPlugin, IAdminLayer, AdminAuthenticationEditForm), provides=IFormHelp)
+class AdminAuthenticationHelpAdapter(FormHelp):
     """Admin authentication edit form help adapter"""
 
     header = _("WARNING")