diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 025ee6c8c..a8b367487 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -531,12 +531,12 @@ class AuthControllerCore extends FrontController
 			if (!count($this->errors))
 			{
 				// if registration type is in one step, we save the address
-				if (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || Tools::isSubmit('submitGuestAccount'))
+				if (Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount'))
 					if (!($country = new Country($address->id_country, Configuration::get('PS_LANG_DEFAULT'))) || !Validate::isLoadedObject($country))
 						die(Tools::displayError());
 				$contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0;
 				$id_state = isset($address) && is_object($address) ? (int)$address->id_state: 0;
-				if ((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state)
+				if ((Tools::isSubmit('submitAccount')|| Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state)
 					$this->errors[] = Tools::displayError('This country requires you to choose a State.');
 				else
 				{