diff --git a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
index da7a95775..d0b6e3aa2 100644
--- a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
@@ -45,7 +45,6 @@
 					{else}
 						<span class="label label-warning">{l s='Not installed'}</span>
 					{/if}
-					
 				{/if}
 			</h4>
 			<p>
@@ -75,6 +74,7 @@
 			<div id="list-action-button" class="btn-group">
 				{assign var=option value=$module->optionsHtml[0]}
 				{$option}
+				{if $module->optionsHtml|count > 1}
 				<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" >
 					<span class="caret">&nbsp;</span>
 				</button>
@@ -85,6 +85,7 @@
 					{/if}
 				{/foreach}
 				</ul>
+				{/if}
 			</div>
 			{/if}
 		</td>
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 7b2e8e67d..2dc78f186 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -2325,7 +2325,7 @@ class AdminControllerCore extends Controller
 			
 			if (in_array($module->name, $filter_modules_list) && $perm)
 			{
-				$this->fillModuleData($module, 'select');
+				$this->fillModuleData($module, 'array');
 				$this->modules_list[array_search($module->name, $filter_modules_list)] = $module;
 			}		
 		}