diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 745cca405..cc7e5f867 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -536,7 +536,7 @@ class AuthControllerCore extends FrontController
 						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') && $contains_state && !$id_state)
+				if ((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state)
 					$this->errors[] = Tools::displayError('This country requires you to chose a State.');
 				else
 				{