Revert "Settings: Security Settings update"

This reverts commit 15af0e0578eb8a384931aa6fa952bcc3c5407e8c.