diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php
index 214720329..d3abd9ddb 100644
--- a/controllers/front/AddressController.php
+++ b/controllers/front/AddressController.php
@@ -117,9 +117,6 @@ class AddressControllerCore extends FrontController
 	 */
 	protected function processSubmitAddress()
 	{
-		/*if ($this->context->customer->is_guest)
-			Tools::redirect('index.php?controller=addresses');*/
-
 		$address = new Address();
 		$this->errors = $address->validateController();
 		$address->id_customer = (int)$this->context->customer->id;
@@ -241,7 +238,7 @@ class AddressControllerCore extends FrontController
 			}
 			else
 				Tools::redirect('index.php?controller=addresses');
-		}
+		}		
 		$this->errors[] = Tools::displayError('An error occurred while updating your address.');
 	}
 
@@ -253,10 +250,6 @@ class AddressControllerCore extends FrontController
 	{
 		parent::initContent();
 
-		/* Secure restriction for guest */
-		if ($this->context->customer->is_guest)
-			Tools::redirect('index.php?controller=addresses');
-
 		$this->assignCountries();
 		$this->assignVatNumber();
 		$this->assignAddressFormat();
diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php
index 96e38c5fb..2cfddfebd 100644
--- a/controllers/front/OrderController.php
+++ b/controllers/front/OrderController.php
@@ -327,8 +327,10 @@ class OrderControllerCore extends ParentOrderController
 			$this->context->cart->autosetProductAddress();
 
 		$this->context->smarty->assign('cart', $this->context->cart);
-		if ($this->context->customer->is_guest)
+		/*
+if ($this->context->customer->is_guest)
 			Tools::redirect('index.php?controller=order&step=2');
+*/
 	}
 
 	/**