diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 11181cc43..d636b6325 100755
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -398,7 +398,7 @@ class FrontControllerCore extends Controller
 			$this->displayRestrictedCountryPage();
 
 		if (Tools::isSubmit('live_edit') && !$this->checkLiveEditAccess())
-			die(Tools::displayError());
+			Tools::redirect('index.php?controller=404');
 
 		$this->iso = $iso;
 
diff --git a/controllers/admin/AdminModulesPositionsController.php b/controllers/admin/AdminModulesPositionsController.php
index f614e7755..bb01368cd 100644
--- a/controllers/admin/AdminModulesPositionsController.php
+++ b/controllers/admin/AdminModulesPositionsController.php
@@ -303,7 +303,7 @@ class AdminModulesPositionsControllerCore extends AdminController
 	{
 		$url = $this->context->shop->getBaseURL().Dispatcher::getInstance()->createUrl('index', (int)$this->context->language->id, $live_edit_params);
 		if (Configuration::get('PS_REWRITING_SETTINGS'))
-			$url = str_replace('index.php', Language::getIsoById($this->context->employee->id_lang).'/', $url);
+			$url = str_replace('index.php', ((count(Language::getLanguages(true)) > 1)? Language::getIsoById($this->context->employee->id_lang).'/' : ''), $url);
 		return $url;
 	}