diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java b/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
index 377e5cd..8896f5f 100644
--- a/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
+++ b/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
@@ -148,7 +148,11 @@ public abstract class Getdown extends Thread
                 // create a panel they can use to configure the proxy settings
                 _container = createContainer();
                 configureContainer();
-                _container.add(new ProxyPanel(this, _msgs), BorderLayout.CENTER);
+                ProxyPanel panel = new ProxyPanel(this, _msgs);
+                // set up any existing configured proxy
+                String[] hostPort = ProxyUtil.loadProxy(_app);
+                panel.setProxy(hostPort[0], hostPort[1]);
+                _container.add(panel, BorderLayout.CENTER);
                 showContainer();
                 // allow them to close the window to abort the proxy configuration
                 _dead = true;
diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyPanel.java b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyPanel.java
index 5a620dd..2178273 100644
--- a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyPanel.java
+++ b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyPanel.java
@@ -96,13 +96,12 @@ public final class ProxyPanel extends JPanel implements ActionListener
         button.setActionCommand("cancel");
         button.addActionListener(this);
         add(row);
+    }
 
-        // set up any existing proxy defaults
-        String host = System.getProperty("http.proxyHost");
+    public void setProxy (String host, String port) {
         if (host != null) {
             _host.setText(host);
         }
-        String port = System.getProperty("http.proxyPort");
         if (port != null) {
             _port.setText(port);
         }