Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java	(revision 6984)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java	(revision 8664)
@@ -34,4 +34,7 @@
 
 	static ArrayList<WMSInfo> wmsList = new ArrayList<WMSInfo>();
+
+       // remember state of menu item to restore on changed preferences
+       static private boolean menuEnabled = false;
 	
 	public WMSPlugin() {
@@ -118,5 +121,5 @@
 		wmsJMenu.addSeparator();
 		wmsJMenu.add(new JMenuItem(new Help_WMSmenuAction()));
-		setEnabledAll(false);
+               setEnabledAll(menuEnabled);
 	}
 
@@ -135,4 +138,5 @@
 			if(item != null) item.setEnabled(isEnabled);
 		}
+               menuEnabled = isEnabled;
 	}
 	
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java	(revision 6984)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java	(revision 8664)
@@ -111,9 +111,9 @@
 		}
 		
-		// josm doesn't seem to give us an option to delete preferences, 
-		// we can only overwrite them with empty strings...
+               // using null values instead of empty string really deletes
+               // the preferences entry
 		for (WMSInfo i : oldValues.values()) {
-			i.url = ""; 
-			i.name = "";
+                       i.url = null;
+                       i.name = null;
 			i.save();
 			change = true;