Revert "Revert "Security issues""

This reverts commit 6ff331202f9a493089cc4ecb39b5fafc4d78c54d.