Index: /trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 1687)
+++ /trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 1688)
@@ -552,5 +552,5 @@
                 tr(   "Failed to initialize communication with the OSM server {0}.\n"
                         + "Check the server URL in your preferences and your internet connection.",
-                        Main.pref.get("osm-server.url")
+                        Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api")
                 ),
                 tr("Error"),
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 1687)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 1688)
@@ -353,5 +353,4 @@
         put("commandstack.visible", true);
         put("projection", Mercator.class.getName());
-        put("osm-server.url", "http://api.openstreetmap.org/api");
         if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) {
             put("laf", "javax.swing.plaf.metal.MetalLookAndFeel");
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java	(revision 1687)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java	(revision 1688)
@@ -29,5 +29,5 @@
 
     public void addGui(PreferenceDialog gui) {
-        osmDataServer.setText(Main.pref.get("osm-server.url"));
+        osmDataServer.setText(Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api"));
         osmDataUsername.setText(Main.pref.get("osm-server.username"));
         osmDataPassword.setText(Main.pref.get("osm-server.password"));
Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 1687)
+++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 1688)
@@ -76,5 +76,5 @@
      */
     static public OsmApi getOsmApi() {
-        String serverUrl = Main.pref.get("osm-server.url");
+        String serverUrl = Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api");
         if (serverUrl == null)
             throw new IllegalStateException(tr("preference ''{0}'' missing. Can't initialize OsmApi", "osm-server.url"));