Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java	(revision 22480)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java	(revision 22504)
@@ -147,5 +147,6 @@
                     Collection<Command> cmds = new LinkedList<Command>();
                     addAddrToPrimitive(currentMouseNode, cmds);
-                    applyInputNumberChange();
+                    if (num == null)
+                        applyInputNumberChange();
                 }
                 setSelectedWay((Way)null);
@@ -155,4 +156,7 @@
                 if (wayInRelationAddr == null) {
                     // node exists but doesn't carry address information : add tags like a new node
+                    if (ctrl) {
+                        applyInputNumberChange();
+                    }
                     Collection<Command> cmds = new LinkedList<Command>();
                     addAddrToPrimitive(currentMouseNode, cmds);
@@ -182,4 +186,7 @@
                 } else {
                     Collection<Command> cmds = new LinkedList<Command>();
+                    if (ctrl) {
+                        applyInputNumberChange();
+                    }
                     if (tagPolygon.isSelected()) {
                         addAddrToPolygon(mouseOnExistingBuildingWays, cmds);
@@ -218,5 +225,5 @@
     
     private void addAddrToPrimitive(OsmPrimitive osm, Collection<Command> cmds) {
-        // add the current tag addr:housenumber in node and member in relation
+        // add the current tag addr:housenumber in node and member in relation (if so configured)
         if (shift) {
             try {