diff --git a/core/lib/Thelia/Controller/Admin/ModuleController.php b/core/lib/Thelia/Controller/Admin/ModuleController.php
index ec7ff472f..4a22c868a 100644
--- a/core/lib/Thelia/Controller/Admin/ModuleController.php
+++ b/core/lib/Thelia/Controller/Admin/ModuleController.php
@@ -70,9 +70,13 @@ class ModuleController extends BaseAdminController
 
         if($this->getRequest()->isXmlHttpRequest()) {
             if($message) {
-                $response = $this->nullResponse($message, 500);
+                $response = $this->jsonResponse(json_encode(array(
+                    "error" => $message
+                )), 500);
+            } else {
+                $response = $this->nullResponse();
             }
-            $response = $this->nullResponse();
+
         } else {
             $this->redirectToRoute('admin.module');
         }
diff --git a/templates/admin/default/includes/module-block.html b/templates/admin/default/includes/module-block.html
index 2b45f5bc3..dd499393f 100644
--- a/templates/admin/default/includes/module-block.html
+++ b/templates/admin/default/includes/module-block.html
@@ -22,14 +22,14 @@
                     <td><a href="#">{$TITLE}</a></td>
                     <td>{$CHAPO}</td>
                     <td>
-                        <div class="make-switch switch-small module-activation" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                        <div class="make-switch switch-small module-activation" data-id="{$ID}" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
                             <input type="checkbox" {if $ACTIVE}checked{/if}>
                         </div>
                         <noscript>
                             {if $ACTIVE}
-                                <a href="{url path="/admin/configuration/modules/toggle-activation/{$ID}"}">{intl l="deactivation"}</a>
+                                <a title="{intl l="Deactivate %title module" title=$TITLE}" href="{url path="/admin/configuration/modules/toggle-activation/{$ID}"}">{intl l="deactivation"}</a>
                             {else}
-                                <a href="{url path="/admin/configuration/modules/toggle-activation/{$ID}"}">{intl l="activation"}</a>
+                                <a title="{intl l="activate %title module" title=$TITLE}" href="{url path="/admin/configuration/modules/toggle-activation/{$ID}"}">{intl l="activation"}</a>
                             {/if}
                         </noscript>
                     </td>
diff --git a/templates/admin/default/modules.html b/templates/admin/default/modules.html
index 06d7420bd..57bb14bf1 100644
--- a/templates/admin/default/modules.html
+++ b/templates/admin/default/modules.html
@@ -55,6 +55,21 @@
     form_content        = {$smarty.capture.delete_module_dialog nofilter}
 }
 
+<div class="modal fade" id="module-failed" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h3>{intl l="An error occured"}</h3>
+            </div>
+            <div class="modal-body" id="module-failed-body">
+
+            </div>
+        </div>
+    </div>
+</div>
+
 {/block}
 
 {block name="javascript-initialization"}
@@ -62,4 +77,24 @@
     {javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
+
+    <script>
+        $(document).ready(function(){
+           var url_management = "{url path="/admin/configuration/modules/toggle-activation/"}";
+           $(".module-activation").on("switch-change", function(e, data){
+               $('body').append('<div class="modal-backdrop fade in" id="loading-event"><div class="loading"></div></div>');
+               $.ajax({
+                    url: url_management+$(this).data('id')
+               }).done(function(){
+                   $("#loading-event").remove();
+               })
+               .fail(function(jqXHR, textStatus, errorThrown){
+                    $("#loading-event").remove();
+                    $('#module-failed-body').html(jqXHR.responseJSON.error);
+                    $("#module-failed").modal("show");
+               });
+
+           });
+        });
+    </script>
 {/block}
\ No newline at end of file