diff --git a/src/js/yunohost/controllers/backup.js b/src/js/yunohost/controllers/backup.js
index 9511b6fc..82b1e613 100644
--- a/src/js/yunohost/controllers/backup.js
+++ b/src/js/yunohost/controllers/backup.js
@@ -62,7 +62,7 @@
 
 
     app.post('#/backup/:storage', function (c) {
-        var params = c.ungroupHooks(c.params['hooks'],c.params['apps']);
+        var params = c.ungroupHooks(c.params['system_parts'],c.params['apps']);
         c.api('/backup', function() {
             store.clear('slide');
             c.redirect('#/backup/'+ c.params['storage']);
@@ -75,7 +75,7 @@
             y18n.t('backup'),
             y18n.t('confirm_restore', [c.params['archive']]),
             $.proxy(function(c){
-                var params = c.ungroupHooks(c.params['hooks'],c.params['apps']);
+                var params = c.ungroupHooks(c.params['system_parts'],c.params['apps']);
                 params['force'] = '';
                 c.api('/backup/restore/'+c.params['archive'], function(data) {
                     store.clear('slide');
@@ -134,7 +134,7 @@
             };
             data.other_storages = [];
             data.name = c.params['archive'];
-            data.hooks = c.groupHooks(Object.keys(data['system']));
+            data.system_parts = c.groupHooks(Object.keys(data['system']));
             data.items = (data['hooks']!={} || data['apps']!=[]);
             c.view('backup/backup_info', data);
         });
diff --git a/src/js/yunohost/helpers.js b/src/js/yunohost/helpers.js
index 4422abf5..d057de21 100644
--- a/src/js/yunohost/helpers.js
+++ b/src/js/yunohost/helpers.js
@@ -359,32 +359,31 @@
             return data;
         },
         
-        ungroupHooks: function(hooks,apps) {
+        ungroupHooks: function(system_parts,apps) {
             var data = {};
             data['apps'] = apps || [];
-            data['hooks'] = hooks || [];
+            data['system'] = system_parts || [];
             
-            if (data['hooks'].constructor !== Array) {
-                data['hooks'] = [data['hooks']];
+            if (data['system'].constructor !== Array) {
+                data['system'] = [data['system']];
             }
             if (data['apps'].constructor !== Array) {
                 data['apps'] = [data['apps']];
             }
 
-            if (data['hooks'].length == 0) {
-                data['ignore_hooks'] = '';
-            }
-            if (data['apps'].length == 0) {
-                data['ignore_apps'] = '';
-            }
-
             // Some hook value contains multiple hooks separated by commas
             var split_hooks = [];
-            $.each(data['hooks'], function(i, hook) {
+            $.each(data['system'], function(i, hook) {
                 split_hooks = split_hooks.concat(hook.split(','));
             });
-            data['hooks'] = split_hooks;
+            data['system'] = split_hooks;
 
+            if (data['system'].length == 0) {
+                delete data['system'];
+	    }
+            if (data['apps'].length == 0) {
+                delete data['apps'];
+	    }
             return data;
         },
 
diff --git a/src/views/backup/backup_create.ms b/src/views/backup/backup_create.ms
index 1d7d1a17..a82c2193 100644
--- a/src/views/backup/backup_create.ms
+++ b/src/views/backup/backup_create.ms
@@ -19,7 +19,7 @@
         <div class="list-group">
             {{#each hooks}}
                 <div class="list-group-item">
-                    <input type="checkbox" id="{{@key}}" name="hooks" value="{{value}}" checked class="nice-checkbox">
+                    <input type="checkbox" id="{{@key}}" name="system_parts" value="{{value}}" checked class="nice-checkbox">
                     <label for="{{@key}}" class="pull-right"><span class="sr-only">{{t 'check'}}</span></label>
                     <h2 class="list-group-item-heading">{{name}}</h2>
                     <p class="list-group-item-text">{{description}}</p>
diff --git a/src/views/backup/backup_info.ms b/src/views/backup/backup_info.ms
index d9633489..82c14705 100644
--- a/src/views/backup/backup_info.ms
+++ b/src/views/backup/backup_info.ms
@@ -33,9 +33,9 @@
     </div>
     {{#if items}}
     <div class="list-group">
-        {{#each hooks}}
+        {{#each system_parts}}
         <div class="list-group-item">
-            <input type="checkbox" id="{{@key}}" name="hooks" value="{{value}}" checked class="nice-checkbox">
+            <input type="checkbox" id="{{@key}}" name="system_parts" value="{{value}}" checked class="nice-checkbox">
             <label for="{{@key}}" class="pull-right"><span class="sr-only">{{t 'check'}}</span></label>
             <h2 class="list-group-item-heading">{{name}}</h2>
             <p class="list-group-item-text">{{description}}</p>