diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 26ced2091a4..63e026367ab 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -88,9 +88,9 @@ if ($id > 0 || ! empty($ref))
 {
 	$result = $object->fetch($id, $ref, '', 1);
 	$object->getrights();
-	$entitytouseforuserdir = $object->entity;
-	if (empty($entitytouseforuserdir)) $entitytouseforuserdir=1;
-	$upload_dir = (empty($conf->user->multidir_output[$entitytouseforuserdir]) ? $conf->user->dir_output : $conf->user->multidir_output[$entitytouseforuserdir]) . "/" . $object->id ;
+	//$upload_dir = $conf->user->multidir_output[$object->entity] . "/" . $object->id ;
+	// For users, the upload_dir is always $conf->user->entity for the moment
+	$upload_dir = $conf->user->dir_output. "/" . $object->id ;
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context