diff --git a/src/components/custom/tenant-select.vue b/src/components/custom/tenant-select.vue
index a23d31a5..7f9dbcb6 100644
--- a/src/components/custom/tenant-select.vue
+++ b/src/components/custom/tenant-select.vue
@@ -25,7 +25,7 @@ const { clearTabs } = useTabStore();
 const { toHome } = useRouterPush();
 
 const tenantId = defineModel<CommonType.IdType>('tenantId', { required: false, default: undefined });
-const enabled = defineModel<boolean>('enabled', { required: false, default: true });
+const enabled = defineModel<boolean>('enabled', { required: false, default: false });
 
 const lastSelected = ref<CommonType.IdType>();
 
@@ -71,12 +71,14 @@ async function handleFetchTenantList() {
   const { data, error } = await fetchTenantList();
   if (error) return;
   enabled.value = data.tenantEnabled;
-  tenantOption.value = data.voList.map(tenant => {
-    return {
-      label: tenant.companyName,
-      value: tenant.tenantId
-    };
-  });
+  if (data.tenantEnabled) {
+    tenantOption.value = data.voList.map(tenant => {
+      return {
+        label: tenant.companyName,
+        value: tenant.tenantId
+      };
+    });
+  }
   endLoading();
 }
 onMounted(async () => {
diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue
index 7763a25e..7bc337a7 100644
--- a/src/views/_builtin/login/modules/pwd-login.vue
+++ b/src/views/_builtin/login/modules/pwd-login.vue
@@ -20,11 +20,11 @@ const { loading: codeLoading, startLoading: startCodeLoading, endLoading: endCod
 const { loading: tenantLoading, startLoading: startTenantLoading, endLoading: endTenantLoading } = useLoading();
 
 const codeUrl = ref<string>();
-const captchaEnabled = ref<boolean>(true);
+const captchaEnabled = ref<boolean>(false);
 const registerEnabled = ref<boolean>(false);
 const remberMe = ref<boolean>(false);
 
-const tenantEnabled = ref<boolean>(true);
+const tenantEnabled = ref<boolean>(false);
 
 const tenantOption = ref<SelectOption[]>([]);