diff --git a/admin-dev/themes/default/template/controllers/products/attachments.tpl b/admin-dev/themes/default/template/controllers/products/attachments.tpl
index 1c7b31604..f049f8663 100644
--- a/admin-dev/themes/default/template/controllers/products/attachments.tpl
+++ b/admin-dev/themes/default/template/controllers/products/attachments.tpl
@@ -28,7 +28,7 @@
 <legend>{l s='Attachment'}</legend>
 
 <div class="row">
-	<label class="control-label col-lg-3 required">
+	<label class="control-label col-lg-3 required" for="attachment_name_{$id_lang}">
 		<span class="label-tooltip" data-toggle="tooltip"
 		title="{l s='Maximum 32 characters.'}">
 		{l s='Filename:'}
@@ -46,7 +46,7 @@
 </div>
 	
 <div class="row">
-	<label class="control-label col-lg-3">{l s='Description:'} </label>
+	<label class="control-label col-lg-3" for="attachment_description_{$id_lang}">{l s='Description:'} </label>
 	<div class="col-lg-9">
 		{include
 			file="controllers/products/textarea_lang.tpl"
@@ -58,7 +58,7 @@
 </div>
 
 <div class="row">
-	<label class="control-label col-lg-3">
+	<label class="control-label col-lg-3" for="attachement_filename">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='Upload a file from your computer'} ({$PS_ATTACHMENT_MAXIMUM_SIZE|string_format:'%.2f'} {l s='MB max.'})">
 			{l s='File:'}
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index e6a394690..2bb7de385 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3463,6 +3463,7 @@ class AdminProductsControllerCore extends AdminController
 					'ad' => dirname($_SERVER['PHP_SELF']),
 					'iso_tiny_mce' => $iso_tiny_mce,
 					'languages' => $this->_languages,
+					'id_lang' => $this->context->language->id,
 					'attach1' => Attachment::getAttachments($this->context->language->id, $obj->id, true),
 					'attach2' => Attachment::getAttachments($this->context->language->id, $obj->id, false),
 					'default_form_language' => (int)Configuration::get('PS_LANG_DEFAULT'),