Index: trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java	(revision 3743)
+++ trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java	(revision 3745)
@@ -58,5 +58,7 @@
             test.visit(selection);
             test.endTest();
-            if (Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false)) {
+            if (Main.pref.getBoolean(ValidatorPreference.PREF_OTHER, false) && 
+                Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false))
+            {
                 errors.addAll( test.getErrors() );
             }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java	(revision 3743)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java	(revision 3745)
@@ -148,5 +148,5 @@
         }
 
-        boolean other = Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false);
+        boolean other = Main.pref.getBoolean(ValidatorPreference.PREF_OTHER, false);
         for (TestError e : errors) {
             if (e.getIgnored()) {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java	(revision 3743)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java	(revision 3745)
@@ -5,4 +5,6 @@
 
 import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.Collection;
 
@@ -92,4 +94,12 @@
         testPanel.add(prefOtherUpload, GBC.eol());
 
+        ActionListener otherUploadEnabled = new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                prefOtherUpload.setEnabled(prefOther.isSelected());
+            }
+        };
+        prefOther.addActionListener(otherUploadEnabled);
+        otherUploadEnabled.actionPerformed(null);
+
         GBC a = GBC.eol().insets(-5,0,0,0);
         a.anchor = GBC.EAST;
