diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2f486ebd0..e1d91222a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,8 +3,31 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/hippo/ehviewer/ehclient/EhInfo.java b/app/src/main/java/com/hippo/ehviewer/ehclient/EhInfo.java
index a694bc1ce..86015867f 100644
--- a/app/src/main/java/com/hippo/ehviewer/ehclient/EhInfo.java
+++ b/app/src/main/java/com/hippo/ehviewer/ehclient/EhInfo.java
@@ -78,6 +78,7 @@ public class EhInfo {
     private int mExculdeTagGroup;
     private String mExculdeLanguage;
 
+    private boolean mHAHProxy;
     private String mHAHIp;
     private String mHAHPort;
     private String mHAHPasskey;
@@ -116,6 +117,7 @@ public class EhInfo {
         mPreviewMode = Config.getPreviewMode();
         mExculdeTagGroup = Config.getExculdeTagGroup();
         mExculdeLanguage = Config.getExculdeLanguage();
+        mHAHProxy = Config.getHAHProxy();
         mHAHIp = Config.getHAHIp();
         mHAHPort = Config.getHAHPort();
         mHAHPasskey = Config.getHAHPasskey();
@@ -124,7 +126,7 @@ public class EhInfo {
 
     private String getUconfigString(String previewMode) {
         String proxy;
-        if (TextUtils.isEmpty(mHAHIp) || TextUtils.isEmpty(mHAHPort)) {
+        if (!mHAHProxy || TextUtils.isEmpty(mHAHIp) || TextUtils.isEmpty(mHAHPort)) {
             proxy = "";
         } else {
             proxy = mHAHIp + "%3A" + mHAHPort;
@@ -286,6 +288,11 @@ public class EhInfo {
         updateUconfig();
     }
 
+    public void setHAHProxy(boolean hahProxy) {
+        mHAHProxy = hahProxy;
+        updateUconfig();
+    }
+
     public void setHAHProxy(String ip, String port, String passkey) {
         mHAHIp = ip;
         mHAHPort = port;
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java
index fa5dca2b0..6a25f6b4d 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java
@@ -32,6 +32,7 @@ import android.os.SystemClock;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
+import android.preference.SwitchPreference;
 import android.provider.SearchRecentSuggestions;
 import android.text.util.Linkify;
 import android.view.MenuItem;
@@ -199,6 +200,7 @@ public class SettingsActivity extends AbsPreferenceActivity {
         private static final String KEY_PREVIEW_MODE = "preview_mode";
         private static final String KEY_DEFAULT_FAVORITE = "default_favorite";
         private static final String KEY_HAH_PROXY = "hah_proxy";
+        private static final String KEY_HAH_PROXY_CONFIG = "hah_proxy_config";
 
         private Preference mListDefaultCategory;
         private Preference mExculdeTagGroup;
@@ -206,7 +208,8 @@ public class SettingsActivity extends AbsPreferenceActivity {
         private Preference mClearSuggestions;
         private ListPreference mPreviewMode;
         private ListPreference mDefaultFavorite;
-        private Preference mHAHProxy;
+        private SwitchPreference mHAHProxy;
+        private Preference mHAHProxyConfig;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -224,8 +227,10 @@ public class SettingsActivity extends AbsPreferenceActivity {
             mPreviewMode = (ListPreference) findPreference(KEY_PREVIEW_MODE);
             mPreviewMode.setOnPreferenceChangeListener(this);
             mDefaultFavorite = (ListPreference) findPreference(KEY_DEFAULT_FAVORITE);
-            mHAHProxy = findPreference(KEY_HAH_PROXY);
-            mHAHProxy.setOnPreferenceClickListener(this);
+            mHAHProxy = (SwitchPreference) findPreference(KEY_HAH_PROXY);
+            mHAHProxy.setOnPreferenceChangeListener(this);
+            mHAHProxyConfig = findPreference(KEY_HAH_PROXY_CONFIG);
+            mHAHProxyConfig.setOnPreferenceClickListener(this);
 
             int i = 0;
             String[] entrise = new String[Favorite.FAVORITE_TITLES.length + 1];
@@ -241,6 +246,9 @@ public class SettingsActivity extends AbsPreferenceActivity {
             if (KEY_PREVIEW_MODE.equals(key)) {
                 String newPreviewMode = (String) newValue;
                 EhInfo.getInstance(getActivity()).setPreviewMode(newPreviewMode);
+            } else if (KEY_HAH_PROXY.equals(key)) {
+                boolean hahProxy = (Boolean) newValue;
+                EhInfo.getInstance(getActivity()).setHAHProxy(hahProxy);
             }
             return true;
         }
@@ -310,8 +318,8 @@ public class SettingsActivity extends AbsPreferenceActivity {
                         SimpleSuggestionProvider.AUTHORITY, SimpleSuggestionProvider.MODE);
                 suggestions.clearHistory();
 
-            } else if (KEY_HAH_PROXY.equals(key)) {
-                LinearLayout ll = (LinearLayout) ViewUtils.inflateDialogView(R.layout.hah_proxy, false);
+            } else if (KEY_HAH_PROXY_CONFIG.equals(key)) {
+                LinearLayout ll = (LinearLayout) ViewUtils.inflateDialogView(R.layout.hah_proxy_config, false);
                 final EditText hahIp = (EditText) ll.findViewById(R.id.hah_ip);
                 final EditText hahPort = (EditText) ll.findViewById(R.id.hah_port);
                 final EditText hahPasskey = (EditText) ll.findViewById(R.id.hah_passkey);
diff --git a/app/src/main/java/com/hippo/ehviewer/util/Config.java b/app/src/main/java/com/hippo/ehviewer/util/Config.java
index b780b6d1a..901bb82b7 100644
--- a/app/src/main/java/com/hippo/ehviewer/util/Config.java
+++ b/app/src/main/java/com/hippo/ehviewer/util/Config.java
@@ -253,6 +253,9 @@ public final class Config {
     private static final String KEY_MAX_HISTORY_COUNT = "max_history_count";
     private static final int DEFAULT_MAX_HISTORY_COUNT = 100;
 
+    private static final String KEY_HAH_PROXY = "hah_proxy";
+    private static final boolean DEFAULT_HAH_PROXY = false;
+
     private static final String KEY_HAH_IP = "hah_ip";
     private static final String DEFAULT_HAH_IP = "";
 
@@ -302,6 +305,10 @@ public final class Config {
         return getIntFromStr(KEY_MAX_HISTORY_COUNT, DEFAULT_MAX_HISTORY_COUNT);
     }
 
+    public static boolean getHAHProxy() {
+        return getBoolean(KEY_HAH_PROXY, DEFAULT_HAH_PROXY);
+    }
+
     public static void setHAHIp(String hahIp) {
         setString(KEY_HAH_IP, hahIp);
     }
diff --git a/app/src/main/res/layout/hah_proxy.xml b/app/src/main/res/layout/hah_proxy_config.xml
similarity index 100%
rename from app/src/main/res/layout/hah_proxy.xml
rename to app/src/main/res/layout/hah_proxy_config.xml
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1906ca393..b46444724 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -223,7 +223,8 @@
     <string name="default_favorite">默认收藏夹</string>
     <string name="history_eh_settings_title">历史</string>
     <string name="max_history_count_title">最大历史记录条数</string>
-    <string name="hah_proxy_title">Hentai@Home 服务器</string>
+    <string name="hah_proxy_title">H@H 服务器</string>
+    <string name="hah_proxy_config_title">H@H 服务器设置</string>
     <string name="hah_ip">IP 地址</string>
     <string name="hah_port">端口</string>
     <string name="hah_passkey">密钥（可选）</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 38d940718..93be0334a 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -211,7 +211,8 @@
     <string name="default_favorite">默認收藏夾</string>
     <string name="history_eh_settings_title">歷史</string>
     <string name="max_history_count_title">最大歷史記錄條數</string>
-    <string name="hah_proxy_title">Hentai@Home 服務器</string>
+    <string name="hah_proxy_title">H@H 服務器</string>
+    <string name="hah_proxy_config_title">H@H 服務器設置</string>
     <string name="hah_ip">IP 地址</string>
     <string name="hah_port">端口</string>
     <string name="hah_passkey">密鑰（可選）</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 33aba2eed..d64ead1b5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -211,7 +211,8 @@
     <string name="default_favorite">預設收藏夾</string>
     <string name="history_eh_settings_title">歷史</string>
     <string name="max_history_count_title">最大歷史記錄條數</string>
-    <string name="hah_proxy_title">Hentai@Home 伺服器</string>
+    <string name="hah_proxy_title">H@H 伺服器</string>
+    <string name="hah_proxy_config_title">H@H 伺服器設定</string>
     <string name="hah_ip">IP 地址</string>
     <string name="hah_port">埠</string>
     <string name="hah_passkey">金鑰（可選）</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 04b5e759d..adb64a411 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -227,8 +227,9 @@
     <string name="default_favorite">Default Favorite</string>
     <string name="history_eh_settings_title">History</string>
     <string name="max_history_count_title">The maximum number of history records</string>
-    <string name="hah_eh_settings_title" translatable="false">H@H</string>
-    <string name="hah_proxy_title">Hentai@Home Proxy</string>
+    <string name="hah_eh_settings_title" translatable="false">Hentai@Home</string>
+    <string name="hah_proxy_title">H@H proxy</string>
+    <string name="hah_proxy_config_title">H@H proxy config</string>
     <string name="hah_ip">IP Address</string>
     <string name="hah_port">Port</string>
     <string name="hah_passkey">Passkey (Optional)</string>
diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml
index 29ae349b0..0aad33a00 100644
--- a/app/src/main/res/xml/eh_settings.xml
+++ b/app/src/main/res/xml/eh_settings.xml
@@ -80,10 +80,15 @@
 
     <PreferenceCategory android:title="@string/hah_eh_settings_title" >
 
-        <Preference
+        <SwitchPreference
             android:key="hah_proxy"
             android:title="@string/hah_proxy_title"/>
 
+        <Preference
+            android:key="hah_proxy_config"
+            android:dependency="hah_proxy"
+            android:title="@string/hah_proxy_config_title"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>