diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index de65754a6..65725b943 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -918,6 +918,9 @@
     "authSAML2MetadataUrl": "IDP metadata URL",
     "authSAML2AdvancedSettings": "高级配置",
     "IdpMetadataHelpText": "IDP metadata URL 和 IDP metadata XML参数二选一即可，IDP metadata URL的优先级高",
+    "IdpMetadataUrlHelpText": "从远端地址中加载 IDP Metadata",
+    "authSAMLKeyHelpText": "SP 证书和密钥 是用来和 IDP 加密通信的",
+    "authSAMLCertHelpText": "上传证书密钥后保存, 然后查看 SP Metadata",
     "authCASAttrMap": "用户属性映射",
     "SignaturesAndTemplates": "Signatures and Templates",
     "unselectedUser": "没有选择用户",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index ed429e4e7..a006e75fe 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -895,6 +895,9 @@
     "authSAML2Xml": "IDP metadata XML",
     "authSAML2MetadataUrl": "IDP metadata URL",
     "IdpMetadataHelpText": "Choose one of IDP metadata URL and IDP metadata XML parameters. IDP metadata URL has high priority",
+    "IdpMetadataUrlHelpText": "Load IDP Metadata from remote url",
+    "authSAMLKeyHelpText": "SP cert and private key, using communicate with IDP",
+    "authSAMLCertHelpText": "After upload cert and private key, View SP Metadata",
     "authSAML2AdvancedSettings": "Advanced Settings",
     "unselectedUser": "Unselected user",
     "auto": "Auto",
diff --git a/src/views/settings/Auth/SAML2.vue b/src/views/settings/Auth/SAML2.vue
index 7df33edd2..97693cc80 100644
--- a/src/views/settings/Auth/SAML2.vue
+++ b/src/views/settings/Auth/SAML2.vue
@@ -31,8 +31,14 @@ export default {
         url: '/api/v1/settings/setting/?category=saml2',
         fields: [
           [this.$t('common.Basic'), ['AUTH_SAML2']],
-          [this.$t('common.Params'), ['SAML2_IDP_METADATA_URL', 'SAML2_IDP_METADATA_XML', 'SAML2_SP_ADVANCED_SETTINGS']],
-          [this.$t('common.Certificate'), ['SAML2_SP_CERT_CONTENT', 'SAML2_SP_KEY_CONTENT']],
+          [this.$t('common.Certificate'), [
+            'SAML2_SP_KEY_CONTENT',
+            'SAML2_SP_CERT_CONTENT'
+          ]],
+          [this.$t('common.Params'), [
+            'SAML2_IDP_METADATA_URL', 'SAML2_IDP_METADATA_XML',
+            'SAML2_SP_ADVANCED_SETTINGS'
+          ]],
           [this.$t('common.Other'), [
             'SAML2_LOGOUT_COMPLETELY', 'AUTH_SAML2_ALWAYS_UPDATE_USER',
             'SAML2_RENAME_ATTRIBUTES'
@@ -45,26 +51,29 @@ export default {
           SAML2_IDP_METADATA_URL: {
             component: 'el-input',
             label: this.$t('setting.authSAML2MetadataUrl'),
-            helpText: this.$t('setting.IdpMetadataHelpText')
+            helpText: this.$t('setting.IdpMetadataUrlHelpText')
           },
           SAML2_IDP_METADATA_XML: {
             component: 'el-input',
             el: {
               type: 'textarea',
-              rows: 8
+              rows: 4
             },
-            label: this.$t('setting.authSAML2Xml')
+            label: this.$t('setting.authSAML2Xml'),
+            helpText: this.$t('setting.IdpMetadataHelpText')
           },
           SAML2_SP_ADVANCED_SETTINGS: {
             component: JsonEditor,
             label: this.$t('setting.authSAML2AdvancedSettings'),
             rules: [JsonRequired]
           },
-          SAML2_SP_CERT_CONTENT: {
-            component: UploadKey
-          },
           SAML2_SP_KEY_CONTENT: {
-            component: UploadKey
+            component: UploadKey,
+            helpText: this.$t('setting.authSAMLKeyHelpText')
+          },
+          SAML2_SP_CERT_CONTENT: {
+            component: UploadKey,
+            helpText: this.$t('setting.authSAMLCertHelpText') + ' <a href="/core/auth/saml2/metadata/" target="_blank">查看</a>'
           },
           SAML2_RENAME_ATTRIBUTES: {
             component: JsonEditor,