diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 9b616f243..055831105 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -379,6 +379,8 @@ class AuthControllerCore extends FrontController
 				$this->errors[] = Tools::displayError('An account using this email address has already been registered.', false);
 		// Preparing customer
 		$customer = new Customer();
+		$lastnameAddress = $_POST['lastname'];
+		$firstnameAddress = $_POST['firstname'];		
 		$_POST['lastname'] = Tools::getValue('customer_lastname');
 		$_POST['firstname'] = Tools::getValue('customer_firstname');
 		
@@ -468,8 +470,6 @@ class AuthControllerCore extends FrontController
 		}
 		else // if registration type is in one step, we save the address
 		{
-			$lastnameAddress = $_POST['lastname'];
-			$firstnameAddress = $_POST['firstname'];
 			// Preparing address
 			$address = new Address();
 			$_POST['lastname'] = $lastnameAddress;