Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java	(revision 16684)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java	(revision 16687)
@@ -95,5 +95,5 @@
             // all items were unset (and so is default)
             originalValue = getListEntry("");
-            if (!presetInitiallyMatches && isForceUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
+            if (!presetInitiallyMatches && isUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
                 combobox.setSelectedItem(getListEntry(LAST_VALUES.get(key)));
             } else {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java	(revision 16684)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java	(revision 16687)
@@ -39,5 +39,9 @@
         } else if (usage.unused()) {
             originalValue = null;
-            list.setSelectedItem(originalValue);
+            if (!presetInitiallyMatches && isUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
+                list.setSelectedItem(getListEntry(LAST_VALUES.get(key)));
+            } else {
+                list.setSelectedItem(originalValue);
+            }
         } else {
             originalValue = DIFFERENT;