Added missing parts of CSRF validation
Dev commit: small things