Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java	(revision 16347)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java	(revision 16351)
@@ -96,8 +96,8 @@
 
         if (urlWithPatterns) {
-            str = str.replaceAll("{proj}", proj)
-            .replaceAll("{bbox}", bbox)
-            .replaceAll("{width}", String.valueOf(wi))
-            .replaceAll("{height}", String.valueOf(ht));
+            str = str.replaceAll("\\{proj\\}", proj)
+            .replaceAll("\\{bbox\\}", bbox)
+            .replaceAll("\\{width\\}", String.valueOf(wi))
+            .replaceAll("\\{height\\}", String.valueOf(ht));
         } else {
             if(!str.contains("?"))
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java	(revision 16347)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java	(revision 16351)
@@ -99,5 +99,9 @@
                 name = prefs.get(key);
             else if (elements[3].equals("url"))
-                url = prefs.get(key);
+            {
+                /* FIXME: Remove the if clause after some time */
+                if(!prefs.get(key).startsWith("yahoo:")) /* legacy stuff */
+                    url = prefs.get(key);
+            }
             else if (elements[3].equals("cookies"))
                 cookies = prefs.get(key);