diff --git a/admin-dev/themes/default/template/controllers/modules/filters.tpl b/admin-dev/themes/default/template/controllers/modules/filters.tpl
index 00ec77567..37215147b 100644
--- a/admin-dev/themes/default/template/controllers/modules/filters.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/filters.tpl
@@ -89,6 +89,7 @@
 						<option value="allModules" {if $showTypeModules eq 'allModules'}selected="selected"{/if}>{l s='All Modules'}</option>
 						<option value="nativeModules" {if $showTypeModules eq 'nativeModules'}selected="selected"{/if}>{l s='Native Modules'}</option>
 						<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partners Modules'}</option>
+						{if isset($logged_on_addons)}<option value="addonsModules" {if $showTypeModules eq 'addonsModules'}selected="selected"{/if}>{l s='Modules bought on Addons'}</option>{/if}
 						<optgroup label="{l s='Authors'}">
 							{foreach from=$list_modules_authors key=module_author item=status}
 								<option value="authorModules[{$module_author}]" {if $status eq "selected"}selected{/if}>{$module_author|truncate:20:'...'}</option>
diff --git a/admin-dev/themes/default/template/controllers/modules/header.tpl b/admin-dev/themes/default/template/controllers/modules/header.tpl
index 9c3d7d5bf..ec714bed2 100644
--- a/admin-dev/themes/default/template/controllers/modules/header.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/header.tpl
@@ -34,12 +34,6 @@
 						<div>{l s='Add new module'}</div>
 					</a>
 				</li>
-				<li>
-					<a id="desc-module-addon-new" class="toolbar_btn" href="{$addonsUrl}" title="Add new">
-						<span class="process-icon-new-module-addon" ></span>
-						<div>{l s='Add new via Addons'}</div>
-					</a>
-				</li>
 			</ul>
 
 			<div class="pageTitle">
diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl
index 953b80176..cf8db8080 100644
--- a/admin-dev/themes/default/template/controllers/modules/js.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/js.tpl
@@ -35,7 +35,7 @@
 	var dirNameCurrentIndex = '{$dirNameCurrentIndex}';
 	var ajaxCurrentIndex = '{$ajaxCurrentIndex}';
 	var by = '{l s='by'}';
-	var errorLogin = '{l s='Could not login to Addons, please check your credentials and your internet connection.'}';
+	var errorLogin = '{l s='PrestaShop was unable to login to Addons, please check your credentials and your internet connection.'}';
 	var confirmPreferencesSaved = '{l s='Preferences saved'}';
 	{if isset($smarty.get.anchor)}var anchor = '{$smarty.get.anchor|htmlentities|replace:'(':''|replace:')':''|replace:'{':''|replace:'}':''|replace:'\'':''|replace:'/':''}';{else}var anchor = '';{/if}
 
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index f8d5b14d4..92e73ba8c 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -890,6 +890,8 @@ class AdminModulesControllerCore extends AdminController
 			return true;
 		else if ($show_type_modules == 'partnerModules' && !in_array($module->name, $this->list_partners_modules))
 			return true;
+		else if (!isset($module->type) || ($show_type_modules == 'addonsModules' && $module->type != 'addonsBought'))
+			return true;
 		else if ($show_type_modules == 'otherModules' && (in_array($module->name, $this->list_partners_modules) || in_array($module->name, $this->list_natives_modules)))
 			return true;
 		else if (strpos($show_type_modules, 'authorModules[') !== false)