diff --git a/admin-dev/themes/template/languages/form.tpl b/admin-dev/themes/template/languages/form.tpl
index 33a430691..86c979051 100644
--- a/admin-dev/themes/template/languages/form.tpl
+++ b/admin-dev/themes/template/languages/form.tpl
@@ -23,309 +23,60 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
+{extends file="helper/form/form.tpl"}
 
-{if $firstCall}
-	<script type="text/javascript">
-		var vat_number = {$vat_number};
-		var module_dir = '{$module_dir}';
-		var id_language = {$defaultFormLanguage};
-		var languages = new Array();
-		var langPackOk = "<img src='{$img_dir}admin/information.png' alt='' />{l s='A language pack is available for this ISO (name is)'}";
-		var langPackVersion = "{l s='The compatible Prestashop version for this language and your system is: '}";
-		var langPackInfo = "{l s='After creating the language, you can import the content of the language pack, which you can download above under \"Tools - Translations\"'}";
-		var noLangPack = "<img src='{$img_dir}admin/information.png' alt='' />{l s='No language pack available on prestashop.com for this ISO code'}";
-		var download = "{l s='Download'}";
-
-		$(document).ready(function() {ldelim}
-			{foreach $languages as $k => $language}
-				languages[{$k}] = {ldelim}
-					id_lang: {$language.id_lang},
-					iso_code: '{$language.iso_code}',
-					name: '{$language.name}'
-				{rdelim};
-			{/foreach}
-			displayFlags(languages, id_language, {$allowEmployeeFormLang});
-
-			{if isset($fields_value.id_state)}
-				if ($('#id_country') && $('#id_state'))
-				{ldelim}
-					ajaxStates({$fields_value.id_state});
-					$('#id_country').change(function() {ldelim}
-						ajaxStates();
-					{rdelim});
-				{rdelim}
-			{/if}
-
-			$('#iso_code').keyup(function() {ldelim}
-				checkLangPack();
-			{rdelim});
-		{rdelim});
-	</script>
-	<script type="text/javascript" src="../js/form.js"></script>
-	<script type="text/javascript" src="../js/checkLangPack.js"></script>
-{/if}
-{if isset($fields.title)}<h2>{$fields.title}</h2>{/if}
-<form action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
-	{if $form_id}
-		<input type="hidden" name="id_{$table}" value="{$form_id}" />
+{block name="start_field_block"}
+	<div class="margin-form">
+	{if $input.type == 'special'}
+		<p id="{$input.name}"><img src="../img/admin/{$input.img}" alt="" /> {$input.text}</p>
 	{/if}
-	<fieldset>
-		{foreach $fields as $key => $field}
-			{if $key == 'legend'}
-				<legend>
-					{if isset($field.image)}<img src="{$field.image}" alt="{$field.title}" />{/if}
-					{$field.title}
-				</legend>
-			{elseif $key == 'input'}
-				{foreach $field as $input}
-					{if $input.name == 'id_state'}
-						<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
-					{/if}
-					{if isset($input.label)}
-					<label>{$input.label} </label>
-					{/if}
-					{if $input.type == 'hidden'}
-						<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]}" />
-					{else}
-					<div class="margin-form">
-						{if $input.type == 'text'}
-							{if isset($input.lang) && isset($input.attributeLang)}
-								{foreach $languages as $language}
-									<div id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
-										<input type="text"
-												name="{$input.name}_{$language.id_lang}"
-												value="{$fields_value[$input.name][$language.id_lang]}"
-												{if isset($input.size)}size="{$input.size}"{/if}
-												{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
-												{if isset($input.class)}class="{$input.class}"{/if}
-												{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
-												{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
-										{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-									</div>
-								{/foreach}
-								{if count($languages) > 1}
-									<div class="displayed_flag">
-										<img src="../img/l/{$defaultFormLanguage}.jpg"
-											class="pointer"
-											id="language_current_{$input.name}"
-											onclick="toggleLanguageFlags(this);" />
-									</div>
-									<div id="languages_{$input.name}" class="language_flags">
-										{l s='Choose language:'}<br /><br />
-										{foreach $languages as $language}
-												<img src="../img/l/{$language.id_lang}.jpg"
-													class="pointer"
-													alt="{$language.name}"
-													title="{$language.name}"
-													onclick="changeLanguage('{$input.name}', '{$input.attributeLang}', {$language.id_lang}, '{$language.iso_code}');" />
-										{/foreach}
-									</div>
+{/block}
+
+{block name=script}
+
+	$(document).ready(function() {
+		$('#iso_code').keyup(function() {
+			checkLangPack();
+		});
+	});
+
+{/block}
+
+{block name="other_fieldsets"}
+
+	{if isset($fields['new'])}
+		<br /><br />
+		<fieldset style="width:572px;">
+			{foreach $fields['new'] as $key => $field}
+				{if $key == 'legend'}
+					<legend>
+						{if isset($field.image)}<img src="{$field.image}" alt="{$field.title}" />{/if}
+						{$field.title}
+					</legend>
+					<p>{l s='This language is NOT complete and cannot be used in the Front or Back Office because some files are missing.'}</p>
+					<br />
+				{elseif $key == 'list_files'}
+					{foreach $field as $list}
+						<label>{$list.label}</label>
+						<div class="margin-form" style="margin-top:4px;">
+							{foreach $list.files as $key => $file}
+								{if !file_exists($key)}
+									<font color="red">
 								{/if}
-							{else}
-								<input type="text"
-										name="{$input.name}"
-										id="{$input.name}"
-										value="{$fields_value[$input.name]}"
-										{if isset($input.size)}size="{$input.size}"{/if}
-										{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
-										{if isset($input.class)}class="{$input.class}"{/if}
-										{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
-										{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
-								{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-							{/if}
-						{elseif $input.type == 'select'}
-							{if isset($input.options.query) && !$input.options.query && isset($input.empty_message)}
-								{$input.empty_message}
-								{$input.required = false}
-								{$input.p = null}
-							{else}
-								<select name="{$input.name}" id="{$input.name}" {if isset($input.multiple)}multiple="multiple" {/if}{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
-									{if isset($input.options.default)}
-										<option value="{$input.options.default.value}">{$input.options.default.label}</option>
-									{/if}
-									{if isset($input.options.optiongroup)}
-										{foreach $input.options.optiongroup.query AS $optiongroup}
-											<optgroup label="{$optiongroup[$input.options.optiongroup.label]}">
-												{foreach $optiongroup[$input.options.options.query] as $option}
-													<option value="{$option[$input.options.options.id]}"
-														{if isset($input.multiple)}
-															{foreach $fields_value[$input.name] as $field_value}
-																{if $field_value == $option[$input.options.options.id]}selected="selected"{/if}
-															{/foreach}
-														{else}
-															{if $fields_value[$input.name] == $option[$input.options.options.id]}selected="selected"{/if}
-														{/if}
-													>{$option[$input.options.options.name]|escape:'htmlall':'UTF-8'}</option>
-												{/foreach}
-											</optgroup>
-										{/foreach}
-									{else}
-										{foreach $input.options.query AS $option}
-											<option value="{$option[$input.options.id]}"
-												{if isset($input.multiple)}
-													{foreach $fields_value[$input.name] as $field_value}
-														{$field_value}
-														{if $field_value == $option[$input.options.id]}selected="selected"{/if}
-													{/foreach}
-												{else}
-													{if $fields_value[$input.name] == $option[$input.options.id]}selected="selected"{/if}
-												{/if}
-											>{$option[$input.options.name]|escape:'htmlall':'UTF-8'}</option>
-										{/foreach}
-									{/if}
-								</select>
-							{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-							{/if}
-						{elseif $input.type == 'radio'}
-							{foreach $input.values as $value}
-								<input type="radio"
-										name="{$input.name}"
-										id="{$value.id}"
-										value="{$value.value|escape:'htmlall':'UTF-8'}"
-										{if $fields_value[$input.name] == $value.value}checked="checked"{/if} />
-								<label {if isset($input.class)}class="{$input.class}"{/if} for="{$value.id}">
-								 {if isset($input.is_bool) && $input.is_bool == true}
-								 	{if $value.value == 1}
-								 		<img src="../img/admin/enabled.gif" alt="{$value.label}" title="{$value.label}" />
-								 	{else}
-								 		<img src="../img/admin/disabled.gif" alt="{$value.label}" title="{$value.label}" />
-								 	{/if}
-								 {else}
-								 	{$value.label}
-								 {/if}
-								</label>
-								{if isset($input.br) && $input.br}<br />{/if}
+								{$key}
+								{if !file_exists($key)}
+									</font>
+								{/if}
+								<br />
 							{/foreach}
-						{elseif $input.type == 'textarea'}
-							{if isset($input.lang) && isset($input.attributeLang)}
-								{foreach $languages as $language}
-									<div id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
-										<textarea cols="{$input.cols}" rows="{$input.rows}" name="{$input.name}_{$language.id_lang}">{$fields_value[$input.name][$language.id_lang]}</textarea>
-									</div>
-								{/foreach}
-								{if count($languages) > 1}
-									<div class="displayed_flag">
-										<img src="../img/l/{$defaultFormLanguage}.jpg"
-											class="pointer"
-											id="language_current_{$input.name}"
-											onclick="toggleLanguageFlags(this);" />
-									</div>
-									<div id="languages_{$input.name}" class="language_flags">
-										{l s='Choose language:'}<br /><br />
-										{foreach $languages as $language}
-												<img src="../img/l/{$language.id_lang}.jpg"
-													class="pointer"
-													alt="{$language.name}"
-													title="{$language.name}"
-													onclick="changeLanguage('{$input.name}', '{$input.attributeLang}', {$language.id_lang}, '{$language.iso_code}');" />
-										{/foreach}
-									</div>
-								{/if}
-							{else}
-								<textarea name="{$input.name}" id="{$input.name}" cols="{$input.cols}" rows="{$input.rows}">{$fields_value[$input.name]}</textarea>
-							{/if}
-						{elseif $input.type == 'checkbox'}
-							{foreach $input.values.query as $value}
-								{assign var=id_checkbox value=$input.name|cat:'_'|cat:$value[$input.values.id]}
-								<input type="checkbox" name="{$id_checkbox}" id="{$id_checkbox}" {if $fields_value[$id_checkbox]}checked="checked"{/if} />
-								<label for="{$id_checkbox}" class="t"><strong>{$value[$input.values.name]}</strong></label><br />
-							{/foreach}
-						{elseif $input.type == 'file'}
-							<input type="file" name="{$input.name}" />
-							<img src="{$fields_value[$input.name]}" />
-						{elseif $input.type == 'password'}
-							<input type="password"
-									name="{$input.name}"
-									size="{$input.size}"
-									value="" />
-						{elseif $input.type == 'special'}
-							<p id="{$input.name}"><img src="{$img_dir}admin/{$input.img}" alt="" /> {$input.text}</p>
-						{elseif $input.type == 'group'}
-							{assign var=groups value=$input.values}
-							{include file='helper/form/form_group.tpl'}
-						{elseif $input.type == 'shop' OR $input.type == 'group_shop'}
-							{include file='helper/form/form_shop.tpl'}
-						{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
-							<label>{l s='Shop association:'}</label>
-							<div class="margin-form">
-								{$asso_shop}
-							</div>
-						{/if}
-						{if isset($input.required) && $input.required} <sup>*</sup>{/if}
-						{if isset($input.p)}
-							<p class="clear">
-								{if is_array($input.p)}
-									{foreach $input.p as $p}
-										{if is_array($p)}
-											<span id="{$p.id}">{$p.text}</span><br />
-										{else}
-											{$p}<br />
-										{/if}
-									{/foreach}
-								{else}
-									{$input.p}
-								{/if}
-							</p>
-						{/if}
-						{if isset($languages)}<div class="clear"></div>{/if}
-					</div>
-					{/if}
-					{if $input.name == 'id_state'}
 						</div>
-					{/if}
-				{/foreach}
-			{elseif $key == 'submit'}
-				<div class="margin-form">
-					<input type="submit" value="{$field.title}" name="{$submit_action}" {if isset($field.class)}class="{$field.class}"{/if} />
-				</div>
-			{/if}
-		{/foreach}
-		{if $required_fields}
-			<div class="small"><sup>*</sup> {l s ='Required field'}</div>
-		{/if}
-	</fieldset>
-</form>
-
-{if isset($fields['new'])}
-	<br /><br />
-	<fieldset style="width:572px;">
-		{foreach $fields['new'] as $key => $field}
-			{if $key == 'legend'}
-				<legend>
-					{if isset($field.image)}<img src="{$field.image}" alt="{$field.title}" />{/if}
-					{$field.title}
-				</legend>
-				<p>{l s='This language is NOT complete and cannot be used in the Front or Back Office because some files are missing.'}</p>
-				<br />
-			{elseif $key == 'list_files'}
-				{foreach $field as $list}
-					<label>{$list.label}</label>
-					<div class="margin-form" style="margin-top:4px;">
-						{foreach $list.files as $key => $file}
-							{if !file_exists($key)}
-								<font color="red">
-							{/if}
-							{$key}
-							{if !file_exists($key)}
-								</font>
-							{/if}
-							<br />
-						{/foreach}
-					</div>
-					<br style="clear:both;" />
-				{/foreach}
-			{/if}
-		{/foreach}
-		<br />
-		<div class="small">{l s='Missing files are marked in red'}</div>
-	</fieldset>
-{/if}
-<br /><br />
-{if $firstCall && !$no_back}
-	{if $back}
-		<a href="{$back}"><img src="{$img_dir}admin/arrow2.gif" />{l s='Back'}</a>
-	{else}
-		<a href="{$current}&token={$token}"><img src="{$img_dir}admin/arrow2.gif" />{l s='Back to list'}</a>
+						<br style="clear:both;" />
+					{/foreach}
+				{/if}
+			{/foreach}
+			<br />
+			<div class="small">{l s='Missing files are marked in red'}</div>
+		</fieldset>
 	{/if}
-	<br />
-{/if}
+
+{/block}
diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php
index 1a4f040be..f12c3f572 100644
--- a/controllers/admin/AdminLanguagesController.php
+++ b/controllers/admin/AdminLanguagesController.php
@@ -299,6 +299,8 @@ class AdminLanguagesControllerCore extends AdminController
 				$this->fields_value['shop'][$row['id_shop']][] = $row[$this->identifier];
 		}
 
+		$this->addJS(_PS_JS_DIR_.'checkLangPack.js');
+
 		return parent::initForm();
 	}