diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
index 39c525c16..2340537db 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
@@ -44,10 +44,16 @@ class Module extends AbstractSmartyPlugin
 
         if (false !== $location = $this->getParam($params, 'location', false)) {
 
+            $moduleLimit = $this->getParam($params, 'module', null);
+
             $modules = ModuleQuery::getActivated();
 
             foreach ($modules as $module) {
 
+                if(null !== $moduleLimit && $moduleLimit != $module->getCode()) {
+                    continue;
+                }
+
                 $file = sprintf("%s/%s/AdminIncludes/%s.html", THELIA_MODULE_DIR, $module->getBaseDir(), $location);
 
                 if (file_exists($file)) {
diff --git a/templates/backOffice/default/module-configure.html b/templates/backOffice/default/module-configure.html
index 218f2aee9..4074b00fc 100644
--- a/templates/backOffice/default/module-configure.html
+++ b/templates/backOffice/default/module-configure.html
@@ -17,7 +17,7 @@
             </ul>
         </div>
 
-        {module_include location='module_configuration'}
+        {module_include location='module_configuration' module=$module_code}
 
     </div>
 </div>