diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue
index ac24b2ce6..fe317ed96 100644
--- a/src/components/AutoDataTable/index.vue
+++ b/src/components/AutoDataTable/index.vue
@@ -237,7 +237,8 @@ export default {
         col.formatter = (row, column, cellValue) => {
           let value = cellValue
           let padding = '0'
-          if (!value && value !== 0) {
+          const excludes = [undefined, null, '']
+          if (excludes.indexOf(value) !== -1) {
             padding = '6px'
             value = '-'
           }
diff --git a/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue
index 6601dc71d..4211e767e 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue
@@ -21,18 +21,18 @@ export default {
     getAddFields() {
       const platform = this.$route.query.platform_type
       const baseFields = [[this.$t('common.Basic'), ['db_name']]]
-      let tlsParams = ['use_ssl', 'ca_cert']
+      let tlsFields = ['use_ssl', 'ca_cert']
       switch (platform) {
         case 'redis':
-          tlsParams = tlsParams.concat(['client_cert', 'client_key'])
+          tlsFields = tlsFields.concat(['client_cert', 'client_key'])
           break
         case 'mongodb':
-          tlsParams = tlsParams.concat(['client_key', 'allow_invalid_cert'])
+          tlsFields = tlsFields.concat(['client_key', 'allow_invalid_cert'])
           break
       }
-      if (tlsParams.length > 2) {
+      if (tlsFields.length > 2) {
         const secureField = [
-          this.$t('assets.Secure'), tlsParams, 3
+          this.$t('assets.Secure'), tlsFields, 2
         ]
         baseFields.push(secureField)
       }
diff --git a/src/views/settings/Auth/index.vue b/src/views/settings/Auth/index.vue
index e250e0f65..20c521940 100644
--- a/src/views/settings/Auth/index.vue
+++ b/src/views/settings/Auth/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <TabPage :submenu="submenu" :active-menu.sync="activeMenu">
+  <TabPage :active-menu.sync="activeMenu" :submenu="submenu">
     <keep-alive>
       <component :is="activeMenu" />
     </keep-alive>
@@ -38,29 +38,19 @@ export default {
     OAuth2
   },
   data() {
-    return {
-      loading: true,
-      activeMenu: 'Basic',
-      submenu: [
-        {
-          title: this.$t('common.Basic'),
-          name: 'Basic'
-        },
-        {
-          title: this.$t('setting.Ldap'),
-          name: 'LDAP'
-        },
-        {
-          title: this.$t('setting.CAS'),
-          name: 'CAS'
-        },
+    const hasLicense = this.$store.getters.hasValidLicense
+    let extraBackends = []
+    if (!this.$store.getters.hasValidLicense) {
+      extraBackends = [
         {
           title: this.$t('setting.OIDC'),
-          name: 'OIDC'
+          name: 'OIDC',
+          hidden: () => !hasLicense
         },
         {
           title: this.$t('setting.SAML2'),
-          name: 'SAML2'
+          name: 'SAML2',
+          hidden: () => !hasLicense
         },
         {
           title: this.$t('setting.OAuth2'),
@@ -88,6 +78,26 @@ export default {
         }
       ]
     }
+    return {
+      loading: true,
+      activeMenu: 'Basic',
+      submenu: [
+        {
+          title: this.$t('common.Basic'),
+          name: 'Basic'
+        },
+        {
+          title: this.$t('setting.Ldap'),
+          name: 'LDAP'
+        },
+        {
+          title: this.$t('setting.CAS'),
+          name: 'CAS',
+          hidden: () => !hasLicense
+        },
+        ...extraBackends
+      ]
+    }
   },
   computed: {
     componentData() {
@@ -96,8 +106,7 @@ export default {
   },
   mounted() {
   },
-  methods: {
-  }
+  methods: {}
 }
 </script>