Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 1604)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 1605)
@@ -36,5 +36,5 @@
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.projection.Epsg4326;
+import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -257,6 +257,6 @@
         } catch (final Exception e) {
             e.printStackTrace();
-            JOptionPane.showMessageDialog(null, tr("The projection could not be read from preferences. Using EPSG:4326"));
-            Main.proj = new Epsg4326();
+            JOptionPane.showMessageDialog(null, tr("The projection could not be read from preferences. Using Mercartor"));
+            Main.proj = new Mercator();
         }
 
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 1604)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 1605)
@@ -28,5 +28,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AboutAction;
-import org.openstreetmap.josm.data.projection.Epsg4326;
+import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.preferences.ProxyPreferences;
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -344,6 +344,6 @@
         put("selectionlist.visible", true);
         put("commandstack.visible", true);
-        put("projection", Epsg4326.class.getName());
-        put("osm-server.url", "http://www.openstreetmap.org/api");
+        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");