Fix Create Step 1
Fix Token CSRF filter