diff --git a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
index cc58dd17c..e7a855f26 100644
--- a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
@@ -193,7 +193,7 @@
 
 <form id="{$table}_form" class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
 	{if $form_id}
-		<input type="hidden" name="id_{$table}" id="id_{$table}" value="{$form_id}" />
+		<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
 	{/if}
 
 	{assign var=tabsize value=count($tabs)}
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 143a7de03..ccb7b51e0 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -44,7 +44,7 @@
 {block name="defaultForm"}
 <form id="{$table}_form" class="defaultForm {$name_controller}" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
 	{if $form_id}
-		<input type="hidden" name="id_{$table}" id="id_{$table}" value="{$form_id}" />
+		<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
 	{/if}
 	{foreach $fields as $f => $fieldset}
 		<fieldset id="fieldset_{$f}">
@@ -247,7 +247,7 @@
 											<div id="image">
 												{$fields_value.image}
 												<p align="center">{l s='File size'} {$fields_value.size}kb</p>
-												<a href="{$current}&id_{$table}={$form_id}&token={$token}&deleteImage=1">
+												<a href="{$current}&{$identifier}={$form_id}&token={$token}&deleteImage=1">
 													<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
 												</a>
 											</div><br />
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 3dd64ad0d..b26b3b242 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1714,7 +1714,7 @@ class AdminControllerCore extends Controller
 		if (Tools::isSubmit('submitFilter'.$this->table) || $this->context->cookie->{'submitFilter'.$this->table} !== false)
 			$this->filter = true;
 
-		$this->id_object = (int)Tools::getValue('id_'.$this->table);
+		$this->id_object = (int)Tools::getValue($this->identifier);
 
 		/* Delete object image */
 		if (isset($_GET['deleteImage']))
@@ -1793,7 +1793,7 @@ class AdminControllerCore extends Controller
 			else
 				$this->errors[] = Tools::displayError('You do not have permission to add here.');
 		}
-		elseif (isset($_GET['update'.$this->table]) && isset($_GET['id_'.$this->table]))
+		elseif (isset($_GET['update'.$this->table]) && isset($_GET[$this->identifier]))
 		{
 			$this->display = 'edit';
 			if ($this->tabAccess['edit'] !== '1')
diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php
index 272f5221b..4abbfa503 100644
--- a/classes/helper/HelperForm.php
+++ b/classes/helper/HelperForm.php
@@ -153,6 +153,7 @@ class HelperFormCore extends Helper
 			'current' => $this->currentIndex,
 			'token' => $this->token,
 			'table' => $this->table,
+			'identifier' => $this->identifier,
 			'name_controller' => $this->name_controller,
 			'languages' => $this->languages,
 			'defaultFormLanguage' => $this->default_form_language,