Improved data sent for Security Settings #827