diff --git a/mouvements/modifier_mouvement.html b/mouvements/modifier_mouvement.html
index 69ca7a4..d671507 100644
--- a/mouvements/modifier_mouvement.html
+++ b/mouvements/modifier_mouvement.html
@@ -204,6 +204,12 @@
 		}}
 
 		{{* enregistrer le mouvement modifié *}}
+		{{if $user == null}}
+			{{:assign user_id=$mvt_new.user}}
+		{{else}}
+			{{:assign user_id=$user.id}}
+		{{/if}}
+
 		{{:save
 			key=$_GET.key
 			validate_schema="movement.schema.json"
@@ -214,7 +220,7 @@
 			equipment=$eqpmt_key
 			date=$mvt_new.date
 			comment=$mvt_new.comment
-			user=$user.id
+			user=$user_id
 			storage=$_POST.storage
 		}}
 		{{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
@@ -228,13 +234,17 @@
 	-------------------- Préparer la saisie --------------------
 *}}
 
-{{* récupérer les infos de la catégorie *}}
 {{#load key=$equipment.category assign="category"}}{{/load}}
 
 {{if $mvt_new.user != null}}
 	{{#select id, !name as nom FROM users WHERE id=:id; !name=$config.user_fields.name_sql :id=$mvt_new.user}}
 		{{:assign var="user.%s"|args:$id value=$nom}}
 	{{/select}}
+	{{#load type="link" where="$$.direction="output" AND $$.temp_key = :mvt_key" :mvt_key=$mvt_new.key limit=1}}
+		{{:assign retour=true}}
+	{{else}}
+		{{:assign retour=false}}
+	{{/load}}
 {{/if}}
 
 {{#load type="storage" order="$$.name"}}
@@ -253,7 +263,7 @@
 			{{/if}}
 			{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}}
 			{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
-			{{if $prop == 1 && $mvt_new.direction == "output"}}
+			{{if $prop == 1 && $mvt_new.direction == "output" && ! $retour}}
 				{{:input
 					type="list"
 					name="user"