diff --git a/extra/modules/admin.ptl b/extra/modules/admin.ptl
index 251dbd5..c022601 100644
--- a/extra/modules/admin.ptl
+++ b/extra/modules/admin.ptl
@@ -271,6 +271,8 @@ class AdelineSettingsDirectory(Directory):
         form.add(StringWidget, 'http_auth_tuple', title = _('HTTP Authentication Tuple'),
                 value = adeline_cfg.get('http_auth_tuple'),
                 hint = _('Format: username:password'))
+        form.add(CheckboxWidget, 'federation_debugging', title = _('Federation Debugging'),
+                value = adeline_cfg.get('federation_debugging'))
         form.add_submit("submit", _("Submit"))
         form.add_submit("cancel", _("Cancel"))
         if form.get_widget('cancel').parse():
@@ -284,7 +286,7 @@ class AdelineSettingsDirectory(Directory):
             cfg_submit(form, 'adeline', ['msp_idp', 'msp_portal_url',
                     'data_migration_url', 'http_auth_tuple',
                     'msp_session_image_url', 'msp_new_account_url',
-                    'adeline_portal_url'])
+                    'adeline_portal_url', 'federation_debugging'])
             redirect('.')
 
     def mspmapping [html] (self):
diff --git a/extra/modules/root.ptl b/extra/modules/root.ptl
index 3529b01..0667c66 100644
--- a/extra/modules/root.ptl
+++ b/extra/modules/root.ptl
@@ -159,12 +159,13 @@ class AlternateRootDirectory(OldRootDirectory):
         '</ul>'
         '</fieldset>'
 
-        '<fieldset class="cdc_connections">'
-        '<legend>%s</legend>' % _('Debug')
-        '<ul>'
-        '<li><a href="reset">%s</a></li>' % _('Reset account federations and offerings')
-        '</ul>'
-        '</fieldset>'
+        if get_cfg('adeline', {}).get('federation_debugging'):
+            '<fieldset class="cdc_connections">'
+            '<legend>%s</legend>' % _('Debug')
+            '<ul>'
+            '<li><a href="reset">%s</a></li>' % _('Reset account federations and offerings')
+            '</ul>'
+            '</fieldset>'
 
         '</div> <!-- end of col2 -->'
         '<div class="cdc_mrpropre">&nbsp;</div>'