diff --git a/datamodels/2.x/itop-attachments/ajax.itop-attachment.php b/datamodels/2.x/itop-attachments/ajax.itop-attachment.php
index e32d252d7..902922781 100644
--- a/datamodels/2.x/itop-attachments/ajax.itop-attachment.php
+++ b/datamodels/2.x/itop-attachments/ajax.itop-attachment.php
@@ -94,6 +94,8 @@ try
 					$oAttachment->Set('expire', time() + MetaModel::GetConfig()->Get('draft_attachments_lifetime'));
 					$oAttachment->Set('temp_id', $sTempId);
 					$oAttachment->Set('item_class', $sClass);
+					$oAttachment->Set('creation_date', time());
+					$oAttachment->Set('user_id', UserRights::GetUserObject());
 					$oAttachment->SetDefaultOrgId();
 					$oAttachment->Set('contents', $oDoc);
 					$iAttId = $oAttachment->DBInsert();
diff --git a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
index d91967942..95692e0d2 100755
--- a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
+++ b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
@@ -54,32 +54,51 @@
         </indexes>
       </properties>
       <fields>
-        <field id="expire" xsi:type="AttributeDateTime">
-          <sql>expire</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="temp_id" xsi:type="AttributeString">
-          <sql>temp_id</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="item_class" xsi:type="AttributeString">
-          <sql>item_class</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="item_id" xsi:type="AttributeObjectKey">
-          <sql>item_id</sql>
-          <is_null_allowed>true</is_null_allowed>
-          <class_attcode>item_class</class_attcode>
-        </field>
-        <field id="item_org_id" xsi:type="AttributeInteger">
-          <sql>item_org_id</sql>
-          <default_value>0</default_value>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="contents" xsi:type="AttributeBlob"/>
+	      <field id="expire" xsi:type="AttributeDateTime">
+		      <sql>expire</sql>
+		      <default_value/>
+		      <is_null_allowed>false</is_null_allowed>
+	      </field>
+	      <field id="temp_id" xsi:type="AttributeString">
+		      <sql>temp_id</sql>
+		      <default_value/>
+		      <is_null_allowed>true</is_null_allowed>
+	      </field>
+	      <field id="item_class" xsi:type="AttributeString">
+		      <sql>item_class</sql>
+		      <default_value/>
+		      <is_null_allowed>false</is_null_allowed>
+	      </field>
+	      <field id="item_id" xsi:type="AttributeObjectKey">
+		      <sql>item_id</sql>
+		      <is_null_allowed>true</is_null_allowed>
+		      <class_attcode>item_class</class_attcode>
+	      </field>
+	      <field id="item_org_id" xsi:type="AttributeInteger">
+		      <sql>item_org_id</sql>
+		      <default_value>0</default_value>
+		      <is_null_allowed>true</is_null_allowed>
+	      </field>
+	      <field id="contents" xsi:type="AttributeBlob"/>
+	      <field id="creation_date" xsi:type="AttributeDateTime">
+		      <sql>creation_date</sql>
+		      <default_value/>
+		      <is_null_allowed>true</is_null_allowed>
+	      </field>
+	      <field id="user_id" xsi:type="AttributeExternalKey">
+		      <sql>user_id</sql>
+		      <is_null_allowed>true</is_null_allowed>
+		      <on_target_delete>DEL_MANUAL</on_target_delete>
+		      <target_class>User</target_class>
+		      <allow_target_creation>false</allow_target_creation>
+	      </field>
+	      <field id="contact_id" xsi:type="AttributeExternalField">
+		      <extkey_attcode>user_id</extkey_attcode>
+		      <target_attcode>contactid</target_attcode>
+		      <dependencies>
+			      <attribute id="user_id"></attribute>
+		      </dependencies>
+	      </field>
       </fields>
       <methods>
         <method id="MapContextParam">
@@ -216,19 +235,22 @@
             </item>
           </items>
         </search>
-        <list>
-          <items>
-            <item id="temp_id">
-              <rank>10</rank>
-            </item>
-            <item id="item_class">
-              <rank>20</rank>
-            </item>
-            <item id="item_id">
-              <rank>30</rank>
-            </item>
-          </items>
-        </list>
+	      <list>
+		      <items>
+			      <item id="temp_id">
+				      <rank>10</rank>
+			      </item>
+			      <item id="item_class">
+				      <rank>20</rank>
+			      </item>
+			      <item id="item_id">
+				      <rank>30</rank>
+			      </item>
+			      <item id="creation_date">
+				      <rank>40</rank>
+			      </item>
+		      </items>
+	      </list>
       </presentation>
     </class>
   </classes>
diff --git a/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php
index 2ee120c56..286f33a9f 100755
--- a/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php
@@ -65,7 +65,8 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Attachments:File:Thumbnail' => 'Icon',
 	'Attachments:File:Name' => 'File name',
-	'Attachments:File:Date' => 'Date added',
+	'Attachments:File:Date' => 'Upload date',
+	'Attachments:File:Creator' => 'Uploaded by',
 	'Attachments:File:Size' => 'Size',
 	'Attachments:File:MimeType' => 'Type',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php
index cfbe47c1d..047e0e870 100755
--- a/datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php
@@ -60,3 +60,13 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Attachment/Attribute:contents' => 'Contenu',
 	'Class:Attachment/Attribute:contents+' => '',
 ));
+
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Attachments:File:Thumbnail' => 'Icône',
+	'Attachments:File:Name' => 'Nom du fichier',
+	'Attachments:File:Date' => 'Date de chargement',
+	'Attachments:File:Creator' => 'Chargé par',
+	'Attachments:File:Size' => 'Taille',
+	'Attachments:File:MimeType' => 'Type',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-attachments/renderers.itop-attachments.php b/datamodels/2.x/itop-attachments/renderers.itop-attachments.php
index 827337852..075949a85 100644
--- a/datamodels/2.x/itop-attachments/renderers.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/renderers.itop-attachments.php
@@ -326,6 +326,7 @@ class TableDetailsAttachmentsRenderer extends AbstractAttachmentsRenderer
 		$this->oPage->add('  <th>'.Dict::S('Attachments:File:Name').'</th>'.PHP_EOL);
 		$this->oPage->add('  <th>'.Dict::S('Attachments:File:Size').'</th>'.PHP_EOL);
 		$this->oPage->add('  <th>'.Dict::S('Attachments:File:Date').'</th>'.PHP_EOL);
+		$this->oPage->add('  <th>'.Dict::S('Attachments:File:Creator').'</th>'.PHP_EOL);
 		$this->oPage->add('  <th>'.Dict::S('Attachments:File:MimeType').'</th>'.PHP_EOL);
 		if ($bWithDeleteButton)
 		{
@@ -424,7 +425,19 @@ CSS
 		$sTrId = $this->GetAttachmentContainerId($iAttachmentId);
 		$sAttachmentMeta = $this->GetAttachmentHiddenInput($iAttachmentId, $bIsDeletedAttachment);
 		$sFileSize = $oDoc->GetFormatedSize();
-		$sAttachmentDate = array_key_exists($iAttachmentId, $aAttachmentsDate) ? $aAttachmentsDate[$iAttachmentId] : 'N/A';
+		$bIsTempAttachment = ($oAttachment->Get('item_id') === 0);
+		$sAttachmentDate = '';
+		if (!$bIsTempAttachment)
+		{
+			$sAttachmentDate = $oAttachment->Get('creation_date');
+			if (empty($sAttachmentDate) && array_key_exists($iAttachmentId, $aAttachmentsDate))
+			{
+				$sAttachmentDate = $aAttachmentsDate[$iAttachmentId];
+			}
+		}
+
+		$sAttachmentCreator = $oAttachment->Get('contact_id_friendlyname');
+
 		$sFileType = $oDoc->GetMimeType();
 
 		$sAttachmentThumbUrl = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($sFileName);
@@ -451,6 +464,7 @@ CSS
 	  <td><a href="$sDocDownloadUrl" target="_blank" class="$sIconClass">$sFileName</a>$sAttachmentMeta</td>
 	  <td>$sFileSize</td>
 	  <td>$sAttachmentDate</td>
+	  <td>$sAttachmentCreator</td>
 	  <td>$sFileType</td>
 	  $sDeleteColumn
 	</tr>