Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 5562)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 5563)
@@ -862,5 +862,9 @@
                 // all items were unset (and so is default)
                 originalValue = lhm.get("");
-                combo.setSelectedItem(originalValue);
+                if ("force".equals(use_last_as_default) && lastValue.containsKey(key)) {
+                    combo.setSelectedItem(lhm.get(lastValue.get(key)));
+                } else {
+                    combo.setSelectedItem(originalValue);
+                }
             } else {
                 originalValue = lhm.get(DIFFERENT);
@@ -1223,5 +1227,5 @@
     public TemplateEntry nameTemplate;
     public Match nameTemplateFilter;
-    private static HashMap<String,String> lastValue = new HashMap<String,String>();
+    private static final HashMap<String,String> lastValue = new HashMap<String,String>();
 
     /**