Index: java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/AEInstaller2Updater.java
===================================================================
--- java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/AEInstaller2Updater.java	(revision 777)
+++ java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/AEInstaller2Updater.java	(revision 852)
@@ -9,4 +9,5 @@
 import javax.swing.UIManager;
 
+import net.oni2.ProxySettings;
 import net.oni2.aeinstaller.updater.backend.Paths;
 import net.oni2.aeinstaller.updater.gui.MainWin;
@@ -41,4 +42,8 @@
 		}
 
+		if (Paths.getProxySettingsFilename().exists()) {
+			ProxySettings.deserializeFromFile(Paths.getProxySettingsFilename());
+		}
+
 		System.setProperty("networkaddress.cache.ttl", "5");
 		System.setProperty("networkaddress.cache.negative.ttl", "1");
Index: java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/backend/Paths.java
===================================================================
--- java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/backend/Paths.java	(revision 777)
+++ java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/backend/Paths.java	(revision 852)
@@ -33,4 +33,11 @@
 
 	/**
+	 * @return Proxy settings filename of AEI
+	 */
+	public static File getProxySettingsFilename() {
+		return new File(getPrefsPath(), "AEI-ProxySettings.xml");
+	}
+
+	/**
 	 * Get the preferences path
 	 *