diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js
index 17d26b9d..25a08500 100644
--- a/src/js/yunohost/controllers/tools.js
+++ b/src/js/yunohost/controllers/tools.js
@@ -172,8 +172,34 @@
                 y18n.t('confirm_reboot_action_' + action),
                 function(){
                     c.api('/'+action+'?force', function(data) {
+                        // This code is not executed due to 502 response (reboot or shutdown)
                         c.redirect('#/logout');
-                    }, 'PUT');
+                    }, 'PUT', {}, false, function (xhr) {
+                        c.flash('success', y18n.t('tools_' + action + '_done'))
+                        // Disconnect from the webadmin 
+                        store.clear('url');
+                        store.clear('connected');
+                        store.set('path', '#/');
+                        
+                        // Rename the page to allow refresh without ask for rebooting
+                        window.location.href = window.location.href.split('#')[0] + '#/';
+                        // Display reboot or shutdown info
+                        // We can't use template because now the webserver is off 
+                        if (action == 'reboot') {
+                            $('#main').replaceWith('<div id="main"><div class="alert alert-warning"><i class="fa-refresh"></i> ' + y18n.t('tools_rebooting') + '</div></div>');
+                        }
+                        else {
+                            $('#main').replaceWith('<div id="main"><div class="alert alert-warning"><i class="fa-power-off"></i> ' + y18n.t('tools_shuttingdown') + '</div></div>');
+                        }
+
+                        // Remove loader if any
+                        $('div.loader').remove();
+
+                        // Force scrollTop on page load
+                        $('html, body').scrollTop(0);
+                        store.clear('slide');
+                    });
+
                 },
                 function(){
                     store.clear('slide');
@@ -187,6 +213,11 @@
             c.redirect('#/tools/reboot');
         }
     });
+    app.get('#/tools/reboot/:action/done', function (c) {
+        var action = c.params['action'].toLowerCase();
+        if (action == 'reboot' || action == 'shutdown') {
+        }
+    });
 
     // Diagnosis
     app.get('#/tools/diagnosis(/:private)?', function (c) {
diff --git a/src/js/yunohost/helpers.js b/src/js/yunohost/helpers.js
index 98fe5236..4422abf5 100644
--- a/src/js/yunohost/helpers.js
+++ b/src/js/yunohost/helpers.js
@@ -62,10 +62,10 @@
         },
 
         // API call
-        api: function(uri, callback, method, data, websocket) {
+        api: function(uri, callback, method, data, websocket, callbackOnFailure) {
             c = this;
 
-            call = function(uri, callback, method, data) {
+            call = function(uri, callback, method, data, callbackOnFailure) {
                 method = typeof method !== 'undefined' ? method : 'GET';
                 data   = typeof data   !== 'undefined' ? data   : {};
                 if (window.navigator && window.navigator.language && (typeof data.locale === 'undefined')) {
@@ -84,6 +84,71 @@
                 if ($('div.loader').length === 0) {
                     $('#main').append('<div class="loader loader-content"></div>');
                 }
+                if (typeof callbackOnFailure !== 'function') {
+                    callbackOnFailure = function(xhr) {
+                        // Postinstall is a custom case, we have to wait that
+                        // operation is done before doing anything
+                        if (uri === '/postinstall') {
+                            if (installing) {
+                                interval = window.location.hostname === args.domain ? 20000 : 5000;
+                                checkInstall = setInterval(function () {
+                                    c.checkInstall(function(isInstalled) {
+                                        if (isInstalled || typeof isInstalled === 'undefined') {
+                                            c.flash('success', y18n.t('installation_complete'));
+                                            clearInterval(checkInstall);
+                                            window.location.href = 'https://'+ window.location.hostname +'/yunohost/admin/';
+                                        }
+                                    });
+                                }, interval);
+                            } else {
+                                c.flash('fail', y18n.t('error_occured'));
+                            }
+                        }
+                        // Regular errors
+                        else {
+                            if (xhr.status == 200) {
+                                // Fail with 200, WTF
+                                callback({});
+                            }
+                            // Unauthorized or wrong password
+                            else if (xhr.status == 401) {
+                                if (uri === '/login') {
+                                    c.flash('fail', y18n.t('wrong_password'));
+                                } else {
+                                    c.flash('fail', y18n.t('unauthorized'));
+                                    c.redirect('#/login');
+                                }
+                            }
+                            // 500
+                            else if (xhr.status == 500) {
+                                error_log = JSON.parse(xhr.responseText);
+                                error_log.route = error_log.route.join(' ') + '\n';
+                                error_log.arguments = JSON.stringify(error_log.arguments);
+                                c.flash('fail', y18n.t('internal_exception', [error_log.route, error_log.arguments, error_log.traceback]));
+                            }
+                            // 502 Bad gateway means API is down
+                            else if (xhr.status == 502) {
+                                c.flash('fail', y18n.t('api_not_responding'));
+                            }
+                            // More verbose error messages first
+                            else if (typeof xhr.responseText !== 'undefined') {
+                                c.flash('fail', xhr.responseText);
+                            }
+                            // Return HTTP error code at least
+                            else {
+                                var errorMessage = xhr.status+' '+xhr.statusText;
+                                c.flash('fail', y18n.t('error_server_unexpected', [errorMessage]));
+                            }
+
+                            // Remove loader if any
+                            $('div.loader').remove();
+
+                            // Force scrollTop on page load
+                            $('html, body').scrollTop(0);
+                            store.clear('slide');
+                        }
+                    };
+                }
 
                 jQuery.ajax({
                     url: 'https://' + store.get('url') + uri,
@@ -99,69 +164,7 @@
                     data = data || {};
                     callback(data);
                 })
-                .fail(function(xhr) {
-                    // Postinstall is a custom case, we have to wait that
-                    // operation is done before doing anything
-                    if (uri === '/postinstall') {
-                        if (installing) {
-                            interval = window.location.hostname === args.domain ? 20000 : 5000;
-                            checkInstall = setInterval(function () {
-                                c.checkInstall(function(isInstalled) {
-                                    if (isInstalled || typeof isInstalled === 'undefined') {
-                                        c.flash('success', y18n.t('installation_complete'));
-                                        clearInterval(checkInstall);
-                                        window.location.href = 'https://'+ window.location.hostname +'/yunohost/admin/';
-                                    }
-                                });
-                            }, interval);
-                        } else {
-                            c.flash('fail', y18n.t('error_occured'));
-                        }
-                    }
-                    // Regular errors
-                    else {
-                        if (xhr.status == 200) {
-                            // Fail with 200, WTF
-                            callback({});
-                        }
-                        // Unauthorized or wrong password
-                        else if (xhr.status == 401) {
-                            if (uri === '/login') {
-                                c.flash('fail', y18n.t('wrong_password'));
-                            } else {
-                                c.flash('fail', y18n.t('unauthorized'));
-                                c.redirect('#/login');
-                            }
-                        }
-                        // 500
-                        else if (xhr.status == 500) {
-                            error_log = JSON.parse(xhr.responseText);
-                            error_log.route = error_log.route.join(' ') + '\n';
-                            error_log.arguments = JSON.stringify(error_log.arguments);
-                            c.flash('fail', y18n.t('internal_exception', [error_log.route, error_log.arguments, error_log.traceback]));
-                        }
-                        // 502 Bad gateway means API is down
-                        else if (xhr.status == 502) {
-                            c.flash('fail', y18n.t('api_not_responding'));
-                        }
-                        // More verbose error messages first
-                        else if (typeof xhr.responseText !== 'undefined') {
-                            c.flash('fail', xhr.responseText);
-                        }
-                        // Return HTTP error code at least
-                        else {
-                            var errorMessage = xhr.status+' '+xhr.statusText;
-                            c.flash('fail', y18n.t('error_server_unexpected', [errorMessage]));
-                        }
-
-                        // Remove loader if any
-                        $('div.loader').remove();
-
-                        // Force scrollTop on page load
-                        $('html, body').scrollTop(0);
-                        store.clear('slide');
-                    }
-                });
+                .fail(callbackOnFailure);
             };
 
             websocket = typeof websocket !== 'undefined' ? websocket : true;
@@ -181,9 +184,9 @@
 
                 ws.onclose = function() {};
 
-                ws.onopen = call(uri, callback, method, data);
+                ws.onopen = call(uri, callback, method, data, callbackOnFailure);
             } else {
-                call(uri, callback, method, data);
+                call(uri, callback, method, data, callbackOnFailure);
             }
 
         },
diff --git a/src/locales/en.json b/src/locales/en.json
index c97f5a7c..23f85215 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -273,8 +273,12 @@
     "tools_security_feed_view_items": "View all security notifications",
     "tools_reboot": "Reboot your server",
     "tools_reboot_btn": "Reboot",
+    "tools_reboot_done": "Rebooting...",
+    "tools_rebooting": "Your server is rebooting. To return on the web administration interface you need to wait your server to be up. You can check that by refreshing regularly this page (F5).",
     "tools_shutdown": "Shutdown your server",
     "tools_shutdown_btn": "Shutdown",
+    "tools_shutdown_done": "Shutting down...",
+    "tools_shuttingdown": "Your server is powerring off. As long as your server is off, you won't be able to use the web administration.",
     "tools_shutdown_reboot": "Shutdown/Reboot",
     "total": "Total",
     "transmission": "Transmission",