Updated saml_settings template and some fixes