Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java	(revision 17651)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java	(revision 17652)
@@ -32,8 +32,10 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener;
 import org.openstreetmap.josm.gui.preferences.SourceEditor;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -153,4 +155,5 @@
 
     private SourceEditor sources;
+    private JCheckBox useValidator;
     private JCheckBox sortMenu;
 
@@ -170,9 +173,14 @@
     @Override
     public void addGui(PreferenceTabbedPane gui) {
+        useValidator = new JCheckBox(tr("Run data validator on user input"), TaggingPreset.USE_VALIDATOR.get());
         sortMenu = new JCheckBox(tr("Sort presets menu alphabetically"), TaggingPresets.SORT_MENU.get());
 
         final JPanel panel = new JPanel(new GridBagLayout());
         panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        panel.add(sortMenu, GBC.eol().insets(5, 5, 5, 0));
+
+        panel.add(useValidator, GBC.std().insets(5, 5, 0, 0));
+        panel.add(new JLabel(ImageProvider.get("dialogs/validator")), GBC.eol().insets(5, 5, 0, 0));
+        panel.add(sortMenu, GBC.eol().insets(5, 0, 5, 0));
+
         sources = new TaggingPresetSourceEditor();
         panel.add(sources, GBC.eol().fill(GBC.BOTH));
@@ -246,5 +254,6 @@
     @Override
     public boolean ok() {
-        if (sources.finish() || TaggingPresets.SORT_MENU.put(sortMenu.getSelectedObjects() != null)) {
+        TaggingPreset.USE_VALIDATOR.put(useValidator.isSelected());
+        if (sources.finish() || TaggingPresets.SORT_MENU.put(sortMenu.isSelected())) {
             TaggingPresets.destroy();
             TaggingPresets.initialize();