Bug fix for CSRF tokens