diff --git a/shadowsocks-csharp/Controller/PortForwarder.cs b/shadowsocks-csharp/Controller/PortForwarder.cs
index ce7d1048..1057143f 100755
--- a/shadowsocks-csharp/Controller/PortForwarder.cs
+++ b/shadowsocks-csharp/Controller/PortForwarder.cs
@@ -133,7 +133,6 @@ namespace Shadowsocks.Controller
 
                     if (bytesRead > 0)
                     {
-                        int bytesToSend;
                         _local.BeginSend(remoteRecvBuffer, 0, bytesRead, 0, new AsyncCallback(PipeConnectionSendCallback), null);
                     }
                     else
diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs
index fde74419..4ec92381 100755
--- a/shadowsocks-csharp/Controller/ShadowsocksController.cs
+++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs
@@ -153,7 +153,7 @@ namespace Shadowsocks.Controller
             }
             if (_config.enabled)
             {
-                SystemProxy.Disable();
+                SystemProxy.Update(_config, true);
             }
         }
 
@@ -262,7 +262,7 @@ namespace Shadowsocks.Controller
         {
             if (_config.enabled)
             {
-                SystemProxy.Enable(_config.global);
+                SystemProxy.Update(_config, false);
                 _systemProxyIsDirty = true;
             }
             else
@@ -270,7 +270,7 @@ namespace Shadowsocks.Controller
                 // only switch it off if we have switched it on
                 if (_systemProxyIsDirty)
                 {
-                    SystemProxy.Disable();
+                    SystemProxy.Update(_config, false);
                     _systemProxyIsDirty = false;
                 }
             }
diff --git a/shadowsocks-csharp/Controller/SystemProxy.cs b/shadowsocks-csharp/Controller/SystemProxy.cs
index c8cc6f8d..dfbc4bc1 100755
--- a/shadowsocks-csharp/Controller/SystemProxy.cs
+++ b/shadowsocks-csharp/Controller/SystemProxy.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.IO;
+using Shadowsocks.Model;
 
 namespace Shadowsocks.Controller
 {
@@ -25,24 +26,39 @@ namespace Shadowsocks.Controller
             _refreshReturn = InternetSetOption(IntPtr.Zero, INTERNET_OPTION_REFRESH, IntPtr.Zero, 0);
         }
 
-        public static void Enable(bool global)
+        public static void Update(Configuration config, bool forceDisable)
         {
+            bool global = config.global;
+            bool enabled = config.enabled;
+            if (forceDisable)
+            {
+                enabled = false;
+            }
             try
             {
                 RegistryKey registry =
                     Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings",
                         true);
-                if (global)
+                if (enabled)
                 {
-                    registry.SetValue("ProxyEnable", 1);
-                    registry.SetValue("ProxyServer", "127.0.0.1:8123");
-                    registry.SetValue("AutoConfigURL", "");
+                    if (global)
+                    {
+                        registry.SetValue("ProxyEnable", 1);
+                        registry.SetValue("ProxyServer", "127.0.0.1:" + config.localPort.ToString());
+                        registry.SetValue("AutoConfigURL", "");
+                    }
+                    else
+                    {
+                        registry.SetValue("ProxyEnable", 0);
+                        registry.SetValue("ProxyServer", "");
+                        registry.SetValue("AutoConfigURL", "http://127.0.0.1:" + config.localPort.ToString() + "/pac?t=" + GetTimestamp(DateTime.Now));
+                    }
                 }
                 else
                 {
                     registry.SetValue("ProxyEnable", 0);
                     registry.SetValue("ProxyServer", "");
-                    registry.SetValue("AutoConfigURL", "http://127.0.0.1:8093/pac?t=" + GetTimestamp(DateTime.Now));
+                    registry.SetValue("AutoConfigURL", "");
                 }
                 SystemProxy.NotifyIE();
                 //Must Notify IE first, or the connections do not chanage
@@ -56,27 +72,6 @@ namespace Shadowsocks.Controller
             }
         }
 
-        public static void Disable()
-        {
-            try
-            {
-                RegistryKey registry =
-                    Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings",
-                        true);
-                registry.SetValue("ProxyEnable", 0);
-                registry.SetValue("ProxyServer", "");
-                registry.SetValue("AutoConfigURL", "");
-                SystemProxy.NotifyIE();
-                CopyProxySettingFromLan();
-            }
-            catch (Exception e)
-            {
-                Logging.LogUsefulException(e);
-                // TODO this should be moved into views
-                MessageBox.Show(I18N.GetString("Failed to update registry"));
-            }
-        }
-
         private static void CopyProxySettingFromLan()
         {
             RegistryKey registry =