diff --git a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
index 5e9db0548..efb117fa9 100644
--- a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
@@ -41,7 +41,7 @@
 	{/if}
 	{$smarty.block.parent}
 	{if $input.type == 'radio' && $input.name == 'smarty_cache'}
-			<a href="{$current}&token={$token}&empty_smarty_cache=1" class="clear button" href="">{l s='Clear Smarty cache'}</a>
+			<a href="{$current}&token={$token}&empty_smarty_cache=1" class="clear button" href="">{l s='Clear Smarty cache & Autoload cache'}</a>
 	{/if}		
 {/block}
 
diff --git a/classes/Autoload.php b/classes/Autoload.php
index 91864a22d..a07c7f068 100644
--- a/classes/Autoload.php
+++ b/classes/Autoload.php
@@ -81,8 +81,7 @@ class Autoload
 			return;
 
 		// regenerate the class index if the requested class is not found in the index or if the requested file doesn't exists
-		if (!isset($this->index[$classname])
-			|| ($this->index[$classname] && !is_file($this->root_dir.$this->index[$classname]))
+		if ((isset($this->index[$classname]) && $this->index[$classname] && !is_file($this->root_dir.$this->index[$classname]))
 			|| (isset($this->index[$classname.'Core']) && $this->index[$classname.'Core'] && !is_file($this->root_dir.$this->index[$classname.'Core'])))
 			$this->generateIndex();
 
diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php
index 798e1912d..acfbe4d20 100644
--- a/controllers/admin/AdminPerformanceController.php
+++ b/controllers/admin/AdminPerformanceController.php
@@ -796,6 +796,7 @@ class AdminPerformanceControllerCore extends AdminController
 		{
 			$redirectAdmin = true;
 			Tools::clearSmartyCache();
+			Autoload::getInstance()->generateIndex();
 		}
 
 		if ($redirectAdmin && (!isset($this->errors) || !count($this->errors)))