Working on some CSRF protection issues