[OE-2470] CSRF changes