Change saml_settings mapping
Added functionality to Profile and other fixes