CSRF protection enhanced. To be tested...