diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php
index b6e79f95a..5f4f900b0 100755
--- a/controllers/admin/AdminLoginController.php
+++ b/controllers/admin/AdminLoginController.php
@@ -37,8 +37,7 @@ class AdminLoginControllerCore extends AdminController
 
 		parent::__construct();
 	}
-	
-	
+
 	public function setMedia()
 	{
 		$this->addJquery();
@@ -69,11 +68,19 @@ class AdminLoginControllerCore extends AdminController
 			}
 		}
 
-		if (file_exists(_PS_ADMIN_DIR_.'/../install') || file_exists(_PS_ADMIN_DIR_.'/../admin'))
-			$this->context->smarty->assign(array(
-				'randomNb' => rand(100, 999),
-				'wrong_folder_name' => true
-			));
+		if (file_exists(_PS_ADMIN_DIR_.'/../install'))
+			$this->context->smarty->assign('wrong_folder_name', true);
+		if (file_exists(_PS_ADMIN_DIR_.'/../admin'))
+		{
+			$rand = sprintf('%04d', rand(0, 9999));
+			if (@rename(_PS_ADMIN_DIR_.'/../admin', _PS_ADMIN_DIR_.'/../admin'.$rand))
+				Tools::redirectAdmin('../admin'.$rand);
+			else
+				$this->context->smarty->assign(array(
+					'randomNb' => rand(100, 999),
+					'wrong_folder_name' => true
+				));
+		}
 
 		// Redirect to admin panel
 		if (Tools::isSubmit('redirect') && Validate::isControllerName(Tools::getValue('redirect')))
@@ -91,6 +98,7 @@ class AdminLoginControllerCore extends AdminController
 				'shop_name' => Tools::safeOutput(Configuration::get('PS_SHOP_NAME')),
 				'disableDefaultErrorOutPut' => true,
 			));
+
 		$this->setMedia();
 		$this->initHeader();
 		parent::initContent();
diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php
index 08681ecf5..1051412a1 100644
--- a/install-dev/controllers/http/process.php
+++ b/install-dev/controllers/http/process.php
@@ -85,21 +85,21 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 
 		if (Tools::getValue('generateSettingsFile'))
 			$this->processGenerateSettingsFile();
-		else if (Tools::getValue('installDatabase') && !empty($this->session->process_validated['generateSettingsFile']))
+		elseif (Tools::getValue('installDatabase') && !empty($this->session->process_validated['generateSettingsFile']))
 			$this->processInstallDatabase();
-		else if (Tools::getValue('installDefaultData'))
+		elseif (Tools::getValue('installDefaultData'))
 			$this->processInstallDefaultData();
-		else if (Tools::getValue('populateDatabase') && !empty($this->session->process_validated['installDatabase']))
+		elseif (Tools::getValue('populateDatabase') && !empty($this->session->process_validated['installDatabase']))
 			$this->processPopulateDatabase();
-		else if (Tools::getValue('configureShop') && !empty($this->session->process_validated['populateDatabase']))
+		elseif (Tools::getValue('configureShop') && !empty($this->session->process_validated['populateDatabase']))
 			$this->processConfigureShop();
-		else if (Tools::getValue('installModules') && !empty($this->session->process_validated['configureShop']))
+		elseif (Tools::getValue('installModules') && !empty($this->session->process_validated['configureShop']))
 			$this->processInstallModules();
-		else if (Tools::getValue('installFixtures') && !empty($this->session->process_validated['installModules']))
+		elseif (Tools::getValue('installFixtures') && !empty($this->session->process_validated['installModules']))
 			$this->processInstallFixtures();
-		else if (Tools::getValue('installTheme') && !empty($this->session->process_validated['installModules']))
+		elseif (Tools::getValue('installTheme') && !empty($this->session->process_validated['installModules']))
 			$this->processInstallTheme();
-		else if (Tools::getValue('sendEmail') && !empty($this->session->process_validated['installTheme']))
+		elseif (Tools::getValue('sendEmail') && !empty($this->session->process_validated['installTheme']))
 			$this->processSendEmail();
 		else
 		{
@@ -210,6 +210,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 
 		if (!$success || $this->model_install->getErrors())
 			$this->ajaxJsonAnswer(false, $this->model_install->getErrors());
+
 		$this->session->process_validated = array_merge($this->session->process_validated, array('configureShop' => true));
 		$this->ajaxJsonAnswer(true);
 	}