Index: /java/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java
===================================================================
--- /java/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java	(revision 871)
+++ /java/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java	(revision 872)
@@ -96,4 +96,5 @@
 	@SuppressWarnings("unused")
 	private boolean save() {
+		ProxySettings prox = ProxySettings.getInstance();
 
 		boolean proxyUse = chkUseProxy.isSelected();
@@ -112,5 +113,4 @@
 		String proxyHost = txtProxyHost.getText();
 
-		ProxySettings prox = ProxySettings.getInstance();
 		if (!prox.getHostOrIp().equalsIgnoreCase(proxyHost)
 				|| (prox.getPort() != proxyPort)
@@ -123,13 +123,15 @@
 			prox.setHostOrIp(proxyHost);
 			prox.setPort(proxyPort);
-			if (!prox.validate()) {
-				JOptionPane.showMessageDialog(this,
-						bundle.getString("proxyVerifyFailed.text"),
-						bundle.getString("proxyVerifyFailed.title"),
-						JOptionPane.ERROR_MESSAGE);
-				prox.setUseProxy(proxyOldUse);
-				prox.setHostOrIp(proxyOldHost);
-				prox.setPort(proxyOldPort);
-				return false;
+			if (proxyUse) {
+				if (!prox.validate()) {
+					JOptionPane.showMessageDialog(this,
+							bundle.getString("proxyVerifyFailed.text"),
+							bundle.getString("proxyVerifyFailed.title"),
+							JOptionPane.ERROR_MESSAGE);
+					prox.setUseProxy(proxyOldUse);
+					prox.setHostOrIp(proxyOldHost);
+					prox.setPort(proxyOldPort);
+					return false;
+				}
 			}