diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
index a02902f31..a070fee92 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
@@ -48,7 +48,7 @@ $(document).ready(function () {
 
 </script>
 <div id="carrier_wizard" class="swMain">
-	<ul>
+	<ul class="nbr_steps_{$wizard_steps.steps|count}">
 	{foreach from=$wizard_steps.steps key=step_nbr item=step}
 		<li>
 			<a href="#step-{$step_nbr + 1}">
diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index 64ca3695c..0c68a7993 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -149,20 +149,32 @@ class AdminCarrierWizardControllerCore extends AdminController
 				),
 			)),
 		);
-		
-		$helper = new HelperForm();
+				
 		$carrier = new Carrier(1);
+		$fields_value = $this->getStep1FieldsValues($carrier);
+		return $this->renderGenericForm($fields_form, $fields_value);
+	}
+	
+	public function renderStepTow($fields_form)
+	{
 		
-		$helper->default_form_language = 1;
+		
+		
+	}
+	
+	public function renderGenericForm($fields_form, $fields_value)
+	{
+		$helper = new HelperForm();
+		$helper->default_form_language = $this->context->language->id;
 		$helper->allow_employee_form_lang = 1;
 		$this->fields_form = array();
 		$helper->tpl_vars = array(
-			'fields_value' => $this->getStep1FieldsValues($carrier),
+			'fields_value' => $fields_value,
 			'languages' => $this->getLanguages(),
 			'id_language' => 1
 			);
 		return $helper->generateForm(array('form' => $fields_form));
-	}
+	} 
 	
 	public function getStep1FieldsValues($carrier)
 	{