 +            except csrf_token.CsrfTokenValidationError:
 +                h.flash_error(_('Security token error, please try again'))
 +                return base.render('admin/confirm_reset.html')
++            del request.POST['csrf-token']
 +
              # remove sys info items
              for item in self._get_config_form_items():
                  name = item['name']
-@@ -96,10 +103,17 @@ class AdminController(base.BaseController):
+@@ -96,10 +104,17 @@ class AdminController(base.BaseController):
                              logic.parse_params(
                                  request.POST, ignore_keys=CACHE_PARAMETERS))))
  

             except logic.ValidationError as e:
                 errors = e.error_dict
                 error_summary = e.error_summary
@@ -134,6 +148,11 @@ class AdminController(base.BaseController):
                                   in request.params):
             return base.render('admin/trash.html')
         else:

diff --git a/ckan/controllers/admin.py b/ckan/controllers/admin.py
index 3d2f44559..3041dd6a2 100644
--- a/ckan/controllers/admin.py
+++ b/ckan/controllers/admin.py
@@ -6,6 +6,7 @@ import ckan.lib.base as base
