diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py
index cdffa0b61..8a86ba284 100644
--- a/apps/jumpserver/settings/custom.py
+++ b/apps/jumpserver/settings/custom.py
@@ -83,3 +83,4 @@ HTTP_LISTEN_PORT = CONFIG.HTTP_LISTEN_PORT
 WS_LISTEN_PORT = CONFIG.WS_LISTEN_PORT
 LOGIN_LOG_KEEP_DAYS = DYNAMIC.LOGIN_LOG_KEEP_DAYS
 ORG_CHANGE_TO_URL = CONFIG.ORG_CHANGE_TO_URL
+WINDOWS_SKIP_ALL_MANUAL_PASSWORD = CONFIG.WINDOWS_SKIP_ALL_MANUAL_PASSWORD
diff --git a/apps/settings/api.py b/apps/settings/api.py
index 354cbdd1d..025db8ae8 100644
--- a/apps/settings/api.py
+++ b/apps/settings/api.py
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 
-import os
 import json
-import jms_storage
 
 from smtplib import SMTPSenderRefused
 from rest_framework import generics
@@ -12,7 +10,6 @@ from django.conf import settings
 from django.core.mail import send_mail
 from django.utils.translation import ugettext_lazy as _
 
-from .models import Setting
 from .utils import (
     LDAPServerUtil, LDAPCacheUtil, LDAPImportUtil, LDAPSyncUtil,
     LDAP_USE_CACHE_FLAGS
@@ -250,11 +247,10 @@ class PublicSettingApi(generics.RetrieveAPIView):
     serializer_class = PublicSettingSerializer
 
     def get_object(self):
-        c = settings.CONFIG
         instance = {
             "data": {
-                "WINDOWS_SKIP_ALL_MANUAL_PASSWORD": c.WINDOWS_SKIP_ALL_MANUAL_PASSWORD,
-                "SECURITY_MAX_IDLE_TIME": c.SECURITY_MAX_IDLE_TIME,
+                "WINDOWS_SKIP_ALL_MANUAL_PASSWORD": settings.WINDOWS_SKIP_ALL_MANUAL_PASSWORD,
+                "SECURITY_MAX_IDLE_TIME": settings.SECURITY_MAX_IDLE_TIME,
             }
         }
         return instance