diff --git a/archiva-docs/src/site/apt/adminguide/network-proxies.apt b/archiva-docs/src/site/apt/adminguide/network-proxies.apt
index aa813901d..4162027de 100644
--- a/archiva-docs/src/site/apt/adminguide/network-proxies.apt
+++ b/archiva-docs/src/site/apt/adminguide/network-proxies.apt
@@ -34,18 +34,4 @@ Understanding Network Proxy Configuration of Apache Archiva
   Once configured, the network proxy can be attached to operations that access remote resources. At present, this is configured on the
   remote repository proxy connectors that need to access the remote repository over the HTTP protocol.
 
-* Network Proxy Settings and the JVM
-
-  As Archiva still targets Java 5 and uses the built-in networking libraries, it must configure these settings using
-  system properties. This can be problematic in two scenarios:
-
-    * if you use multiple different network proxies on different proxy connectors, they may clash
-
-    * if you deploy other applications into the same container as Archiva, they will likely pick up the settings
-
-    []
-
-  Please refer to {{{http://jira.codehaus.org/browse/MRM-1248} MRM-1248}} for workarounds and to track the issue.
-
-  ~~TODO: walkthrough configuration
-
+[../images/network-proxies.png]
diff --git a/archiva-docs/src/site/resources/images/network-proxies.png b/archiva-docs/src/site/resources/images/network-proxies.png
new file mode 100644
index 000000000..227f9ab16
Binary files /dev/null and b/archiva-docs/src/site/resources/images/network-proxies.png differ
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
index 5fe20aa57..aa0fa78fc 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
@@ -47,7 +47,7 @@ define("archiva.network-proxies",["jquery","i18n","jquery.tmpl","bootstrap","jqu
     this.password.subscribe(function(newValue){self.modified(true)});
 
     //use NTLM proxy
-    this.useNtlm=ko.observable(useNtlm);
+    this.useNtlm=ko.observable(useNtlm?useNtlm:false);
     this.useNtlm.subscribe(function(newValue){self.modified(true)});
 
     this.modified=ko.observable(false);