Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 3541)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 3542)
@@ -104,5 +104,5 @@
      * Global application preferences
      */
-    public static Preferences pref = new Preferences();
+    public static Preferences pref;
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/MainApplet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplet.java	(revision 3541)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplet.java	(revision 3542)
@@ -140,4 +140,5 @@
         Main.applet = true;
         MainApplet applet = new MainApplet();
+        Main.pref = new ServerSidePreferences(applet.getCodeBase());
         applet.setStub(new AppletStub() {
             public void appletResize(int w, int h) {
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 3541)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 3542)
@@ -34,4 +34,5 @@
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.data.AutosaveTask;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
@@ -142,4 +143,5 @@
         I18n.init();
         checkJava6();
+        Main.pref = new Preferences();
 
         Policy.setPolicy(new Policy() {