Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 6459)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 6460)
@@ -111,4 +111,5 @@
     public static final IntegerProperty PROP_OVERLAP_NORTH = new IntegerProperty("imagery.wms.overlapNorth", 4);
     public static final IntegerProperty PROP_IMAGE_SIZE = new IntegerProperty("imagery.wms.imageSize", 500);
+    public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty("imagery.wms.default_autozoom", true);
 
     public int messageNum = 5; //limit for messages per layer
@@ -124,5 +125,5 @@
     protected static final int serializeFormatVersion = 5;
     protected boolean autoDownloadEnabled = true;
-    protected boolean autoResolutionEnabled = true;
+    protected boolean autoResolutionEnabled = PROP_DEFAULT_AUTOZOOM.get();
     protected boolean settingsChanged;
     public WmsCache cache;
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java	(revision 6459)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java	(revision 6460)
@@ -26,4 +26,5 @@
 
     // WMS Settings
+    private final JCheckBox autozoomActive;
     private final JosmComboBox browser;
     private final JCheckBox overlapCheckBox;
@@ -37,5 +38,11 @@
     public WMSSettingsPanel() {
         super(new GridBagLayout());
-        
+
+        // Auto zoom
+        autozoomActive = new JCheckBox();
+        add(new JLabel(tr("Auto zoom by default: ")), GBC.std());
+        add(GBC.glue(5, 0), GBC.std());
+        add(autozoomActive, GBC.eol().fill(GBC.HORIZONTAL));
+
         // Downloader
         browser = new JosmComboBox(new String[] {
@@ -80,4 +87,5 @@
      */
     public void loadSettings() {
+        this.autozoomActive.setSelected(WMSLayer.PROP_DEFAULT_AUTOZOOM.get());
         this.browser.setSelectedItem(HTMLGrabber.PROP_BROWSER.get());
         this.overlapCheckBox.setSelected(WMSLayer.PROP_OVERLAP.get());
@@ -92,4 +100,5 @@
      */
     public boolean saveSettings() {
+        WMSLayer.PROP_DEFAULT_AUTOZOOM.put(this.autozoomActive.isSelected());
         WMSLayer.PROP_OVERLAP.put(overlapCheckBox.getModel().isSelected());
         WMSLayer.PROP_OVERLAP_EAST.put((Integer) spinEast.getModel().getValue());