Index: src/org/openstreetmap/josm/actions/SaveAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/SaveAction.java	(revision 19099)
+++ src/org/openstreetmap/josm/actions/SaveAction.java	(working copy)
@@ -91,10 +91,8 @@
     @Override
     protected void updateEnabledState() {
         Layer activeLayer = getLayerManager().getActiveLayer();
-        boolean en = activeLayer != null
-                && activeLayer.isSavable() && !(activeLayer.getAssociatedFile() != null
-                && activeLayer instanceof SaveToFile && !((SaveToFile) activeLayer).requiresSaveToFile());
-        GuiHelper.runInEDT(() -> setEnabled(en));
+		boolean en = activeLayer != null && activeLayer.isSavable();
+		GuiHelper.runInEDT(() -> setEnabled(en));
     }
 
     @Override
Index: src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java	(revision 19099)
+++ src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java	(working copy)
@@ -11,9 +11,11 @@
 import javax.swing.AbstractAction;
 import javax.swing.JCheckBoxMenuItem;
 
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -30,7 +32,7 @@
      * @param layer the layer for which to toggle the {@linkplain OsmDataLayer#setUploadDiscouraged(boolean) discouraged upload flag}
      */
     public ToggleUploadDiscouragedLayerAction(OsmDataLayer layer) {
-        super(tr("Discourage upload"));
+        super(tr("Discourage/Encourage upload"));
         new ImageProvider("no_upload").getResource().attachImageIcon(this, true);
         this.layer = layer;
         setEnabled(layer.isUploadable());
@@ -40,6 +42,8 @@
     @Override
     public void actionPerformed(ActionEvent e) {
         layer.setUploadDiscouraged(!layer.isUploadDiscouraged());
+		String msg = layer.isUploadDiscouraged() ? tr("Upload is discouraged") : tr("Upload is encouraged");
+		GuiHelper.runInEDT(() -> new Notification(msg).show());
         LayerListDialog.getInstance().repaint();
     }
 
Index: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 19099)
+++ src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(working copy)
@@ -1195,6 +1195,7 @@
         if (data.getUploadPolicy() != UploadPolicy.BLOCKED &&
                 (uploadDiscouraged ^ isUploadDiscouraged())) {
             data.setUploadPolicy(uploadDiscouraged ? UploadPolicy.DISCOURAGED : UploadPolicy.NORMAL);
+            setRequiresSaveToFile(true);
             for (LayerStateChangeListener l : layerStateChangeListeners) {
                 l.uploadDiscouragedChanged(this, uploadDiscouraged);
             }