 diff --git a/ckan/controllers/admin.py b/ckan/controllers/admin.py
-index 18eccd1..97d8609 100644
+index 18eccd1..48aae3f 100644
 --- a/ckan/controllers/admin.py
 +++ b/ckan/controllers/admin.py
 @@ -6,6 +6,7 @@ import ckan.lib.base as base

             # remove sys info items
             for item in self._get_config_form_items():
                 name = item['name']
@@ -95,10 +102,15 @@ class AdminController(base.BaseController):
                             logic.parse_params(
                                 request.POST, ignore_keys=CACHE_PARAMETERS))))
 

                     {'user': c.user}, data_dict)
+            except csrf_token.CsrfTokenValidationError:
+                h.flash_error(_('Security token error, please try again'))
+                vars = {'data': data, 'errors': {},
+                        'error_summary': {}, 'form_items': items}
+                return base.render('admin/config.html', extra_vars=vars)
             except logic.ValidationError, e:
                 errors = e.error_dict
                 error_summary = e.error_summary
@@ -133,6 +147,11 @@ class AdminController(base.BaseController):
                                   in request.params):
             return base.render('admin/trash.html')
         else:
