diff --git a/swh/web/templates/includes/vault-create-tasks.html b/swh/web/templates/includes/vault-create-tasks.html
index c04703cb2..a9f542262 100644
--- a/swh/web/templates/includes/vault-create-tasks.html
+++ b/swh/web/templates/includes/vault-create-tasks.html
@@ -1,157 +1,159 @@
 {% if vault_cooking %}
   <a class="btn btn-md btn-swh btn-swh-vault" data-placement="bottom" data-popover-content="#vault-popover" data-toggle="popover" href="#" tabindex="0">
     <i class="fa fa-download fa-fw" aria-hidden="true"></i>Download
   </a>
   <div class="hidden" id="vault-popover">
     <div class="popover-heading">
       Request download from the Software Heritage Vault
     </div>
     <div class="popover-body">
       <div class="btn-group-vertical">
         {% if vault_cooking.directory_context %}
           <button id="vault-cook-directory" type="button" class="btn btn-md btn-swh" data-toggle="modal" data-target="#vault-cook-directory-modal">Cook a standard archive from the current directory</button>
         {% endif %}
         {% if vault_cooking.revision_context %}
           <button id="vault-cook-revision" type="button" class="btn btn-md btn-swh" data-toggle="modal" data-target="#vault-cook-revision-modal">Cook a git fast-import archive from the current revision</button>
         {% endif %}
       </div>
     </div>
   </div>
   <div class="modal fade" id="vault-cook-directory-modal" tabindex="-1" role="dialog" aria-labelledby="vault-cook-directory-modal-label" 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>
           <h4 class="modal-title" id="vault-cook-directory-modal-label">Cook and download a directory from the Software Heritage Vault</h4>
         </div>
         <div class="modal-body">
           <p>
             You have requested the cooking of the directory with identifier <strong>{{ vault_cooking.directory_id }}</strong>
             into a standard tar.gz archive.
           </p>
           <p>
             Are you sure you want to continue ?
           </p>
           <form>
             <div class="form-group">
               <label for="email">(Optional) Send download link once it is available to that email address:</label>
               <input type="email" class="form-control" id="swh-vault-directory-email">
             </div>
           </form>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-md btn-swh" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-md btn-swh" onclick="vault_cook_directory_archive()">Ok</button>
         </div>
       </div>
     </div>
   </div>
   <div class="modal fade" id="vault-cook-revision-modal" tabindex="-1" role="dialog" aria-labelledby="vault-cook-revision-modal-label" 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>
           <h4 class="modal-title" id="vault-cook-revision-modal-label">Cook and download a revision from the Software Heritage Vault</h4>
         </div>
         <div class="modal-body">
           <p>
             You have requested the cooking of the revision with identifier <strong>{{ vault_cooking.revision_id }}</strong>
             into a git fast-import archive.
           </p>
           <p>
             Are you sure you want to continue ?
           </p>
           <form>
             <div class="form-group">
               <label for="email">(Optional) Send download link once it is available to that email address:</label>
               <input type="email" class="form-control" id="swh-vault-revision-email">
             </div>
           </form>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-md btn-swh" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-md btn-swh" onclick="vault_cook_revision_archive()">Ok</button>
         </div>
       </div>
     </div>
   </div>
   <div class="modal fade" id="invalid-email-modal" tabindex="-1" role="dialog" aria-labelledby="invalid-email-modal-label" 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>
           <h4 class="modal-title" id="invalid-email-modal-label">Invalid Email !</h4>
         </div>
         <div class="modal-body">
           <p>The provided email is not well-formed.</p>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-md btn-swh" data-dismiss="modal">Ok</button>
         </div>
       </div>
     </div>
   </div>
   <script>
     var cook_dir_url = "{% url 'vault-cook-directory' 'ffff' %}";
     var cook_rev_url = "{% url 'vault-cook-revision_gitfast' 'ffff' %}";
     function add_vault_cooking_task(cooking_task) {
       var vault_cooking_tasks = JSON.parse(sessionStorage.getItem("swh-vault-cooking-tasks"));
       if (!vault_cooking_tasks) {
         vault_cooking_tasks = [];
       }
       if (vault_cooking_tasks.find(function(val) {
           return val.object_type == cooking_task.object_type &&
                   val.object_id == cooking_task.object_id}) == undefined) {
         var cooking_url;
         if (cooking_task.object_type == 'directory') {
           cooking_url = cook_dir_url.replace('ffff', cooking_task.object_id);
         } else {
           cooking_url = cook_rev_url.replace('ffff', cooking_task.object_id);
         }
         if (cooking_task.email) {
           cooking_url += "?email=" + cooking_task.email;
         }
         $.ajax({
           url : cooking_url,
           type : 'POST',
           success: function() {
             vault_cooking_tasks.push(cooking_task);
             sessionStorage.setItem("swh-vault-cooking-tasks", JSON.stringify(vault_cooking_tasks));
             show_tab('#vault');
           }
         });
+      } else {
+        show_tab('#vault');
       }
     }
     function validateEmail(email) {
       var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
       return re.test(String(email).toLowerCase());
     }
     function vault_cook_directory_archive() {
       var email = $('#swh-vault-directory-email').val().trim();
       if (!email || validateEmail(email)) {
         $('#vault-cook-directory-modal').modal('hide');
         var cooking_task = {'object_type': 'directory',
                             'object_id': '{{ vault_cooking.directory_id }}',
                             'email': email,
                             'status': 'new'};
         add_vault_cooking_task(cooking_task);
 
       } else {
         $('#invalid-email-modal').modal('show');
       }
     }
     function vault_cook_revision_archive() {
       var email = $('#swh-vault-revision-email').val().trim();
       if (!email || validateEmail(email)) {
         $('#vault-cook-revision-modal').modal('hide');
         var cooking_task = {'object_type': 'revision',
                             'object_id': '{{ vault_cooking.revision_id }}',
                             'email': email,
                             'status': 'new'};
         add_vault_cooking_task(cooking_task);
       } else {
         $('#invalid-email-modal').modal('show');
       }
     }
   </script>
 {% endif %}
\ No newline at end of file
diff --git a/swh/web/templates/includes/vault-ui.html b/swh/web/templates/includes/vault-ui.html
index b0f9a4768..68401d173 100644
--- a/swh/web/templates/includes/vault-ui.html
+++ b/swh/web/templates/includes/vault-ui.html
@@ -1,142 +1,164 @@
 {% load static %}
 
 <div class="panel panel-default" style="overflow-x: auto;">
   <div class="panel-heading">
       <h2>Download content from the Software Heritage Vault</h2>
   </div>
   <div class="panel-body">
     <p>
       This interface enables to track the status of the different Software Heritage
       Vault cooking tasks created during the current browsing session.
     </p>
     <p>
       Once a cooking task is finished, a link will be made available in order to
       download the associated archive.
     </p>
     <div class="table-responsive">
       <table class="table swh-vault-table" id="vault-cooking-tasks">
         <thead>
           <tr>
             <th>Object type</th>
             <th>Object id</th>
-            <th>Email notification</th>
-            <th>Cooking status</th>
+            <th style="width: 350px">Cooking status</th>
             <th style="width: 320px"></th>
           </tr>
         </thead>
         <tbody></tbody>
       </table>
     </div>
   </div>
 </div>
 
 <script>
   var cook_dir_url = "{% url 'vault-cook-directory' 'ffff' %}";
   var cook_rev_url = "{% url 'vault-cook-revision_gitfast' 'ffff' %}";
   var browse_dir_url = "{% url 'browse-directory' 'ffff' %}";
   var browse_rev_url = "{% url 'browse-revision' 'ffff' %}";
 
   var progress = '<div class="progress" style="margin-bottom: 0px;"> \
                     <div class="progress-bar progress-bar-success progress-bar-striped" \
                          role="progressbar" aria-valuenow="100" aria-valuemin="0" \
                          aria-valuemax="100" style="width: 100%;height: 100%;"> \
                     </div> \
                   </div>';
 
+  function update_progress_bar(progress_bar, cooking_task) {
+    if (cooking_task.status == 'new') {
+      progress_bar.css('background-color', 'rgba(128, 128, 128, 0.5)');
+    } else if (cooking_task.status == 'pending') {
+      progress_bar.css('background-color', 'rgba(0, 0, 255, 0.5)');
+    } else if (cooking_task.status == 'done') {
+      progress_bar.css('background-color', 'rgba(0, 255, 0, 0.5)');
+    } else if (cooking_task.status == 'failed') {
+      progress_bar.css('background-color', 'rgba(255, 0, 0, 0.5)');
+    }
+    progress_bar.text(cooking_task.progress_message || cooking_task.status);
+    if (cooking_task.status == 'new' || cooking_task.status == 'pending') {
+      progress_bar.addClass('active');
+    } else {
+      progress_bar.removeClass('progress-bar-striped');
+    }
+  }
+
   function check_vault_cooking_tasks() {
     var vault_cooking_tasks = JSON.parse(sessionStorage.getItem("swh-vault-cooking-tasks"));
     if (!vault_cooking_tasks) {
       return;
     }
     var cooking_urls = [];
     var tasks = {};
     for (var i = 0 ; i < vault_cooking_tasks.length ; ++i) {
       var cooking_task = vault_cooking_tasks[i];
       tasks[cooking_task.object_id] = cooking_task;
       var cooking_url;
       if (cooking_task.object_type == 'directory') {
         cooking_url = cook_dir_url.replace('ffff', cooking_task.object_id);
       } else {
         cooking_url = cook_rev_url.replace('ffff', cooking_task.object_id);
       }
       if (cooking_task.status != 'done' && cooking_task.status != 'failed') {
         cooking_urls.push($.ajax(cooking_url));
       }
     }
     $.when.apply($, cooking_urls).then(function() {
-      $("#vault-cooking-tasks tbody tr").remove();
       var table = $("#vault-cooking-tasks tbody");
       for (var i = 0 ; i < cooking_urls.length ; ++i) {
         var resp;
         if (cooking_urls.length == 1) {
           resp = arguments[i];
         } else {
           resp = arguments[i][0];
         }
         var cooking_task = tasks[resp.obj_id];
         cooking_task.status = resp.status;
         cooking_task.fetch_url = resp.fetch_url;
+        cooking_task.progress_message = resp.progress_message;
       }
       for (var i = 0 ; i < vault_cooking_tasks.length ; ++i) {
         var cooking_task = vault_cooking_tasks[i];
-        var browse_url;
-        if (cooking_task.object_type == 'directory') {
-          browse_url = browse_dir_url.replace('ffff', cooking_task.object_id);
-        } else {
-          browse_url = browse_rev_url.replace('ffff', cooking_task.object_id);
-        }
 
-        var progress_bar = $.parseHTML(progress)[0];
-        var progress_bar_content = $(progress_bar).find('.progress-bar');
-        if (cooking_task.status == 'failed') {
-          progress_bar_content.css('background-image', 'none');
-          progress_bar_content.css('background-color', 'red');
-        }
-        progress_bar_content.text(cooking_task.status);
-        if (cooking_task.status == 'pending') {
-          progress_bar_content.addClass('active');
-        } else if (cooking_task.status == 'done') {
-          progress_bar_content.removeClass('progress-bar-striped');
-        }
-        var table_row;
-        if (cooking_task.object_type == 'directory') {
-          table_row = '<tr title="Once downloaded, the directory can be extracted with the ' +
-                      'following command:\n\n$ tar xvzf ' + cooking_task.object_id + '.tar.gz">';
-        } else {
-          table_row = '<tr title="Once downloaded, the git repository can be imported with the ' +
-                      'following commands:\n\n$ git init\n$ zcat ' + cooking_task.object_id + '.gitfast.gz | git fast-import">';
-        }
-        if (cooking_task.object_type == 'directory') {
-          table_row += '<td><i class="fa fa-folder fa-fw" aria-hidden="true"></i>directory</td>';
+        var row_task = $('#vault-task-' + cooking_task.object_id);
+
+        if (!row_task.length) {
+
+          var browse_url;
+          if (cooking_task.object_type == 'directory') {
+            browse_url = browse_dir_url.replace('ffff', cooking_task.object_id);
+          } else {
+            browse_url = browse_rev_url.replace('ffff', cooking_task.object_id);
+          }
+
+          var progress_bar = $.parseHTML(progress)[0];
+          var progress_bar_content = $(progress_bar).find('.progress-bar');
+          update_progress_bar(progress_bar_content, cooking_task);
+          var table_row;
+          if (cooking_task.object_type == 'directory') {
+            table_row = '<tr id="vault-task-' + cooking_task.object_id + '" title="Once downloaded, the directory can be extracted with the ' +
+                        'following command:\n\n$ tar xvzf ' + cooking_task.object_id + '.tar.gz">';
+          } else {
+            table_row = '<tr id="vault-task-' + cooking_task.object_id + '"  title="Once downloaded, the git repository can be imported with the ' +
+                        'following commands:\n\n$ git init\n$ zcat ' + cooking_task.object_id + '.gitfast.gz | git fast-import">';
+          }
+          if (cooking_task.object_type == 'directory') {
+            table_row += '<td><i class="fa fa-folder fa-fw" aria-hidden="true"></i>directory</td>';
+          } else {
+            table_row += '<td><i class="octicon octicon-git-commit fa-fw"></i>revision</td>';
+          }
+          table_row += '<td><a href="' + browse_url + '">' + cooking_task.object_id + '</a></td>';
+          table_row += '<td style="width: 350px">' + progress_bar.outerHTML + '</td>';
+          var dl_link = 'Waiting for download link to be available';
+          if (cooking_task.status == 'done') {
+            dl_link = '<a class="btn btn-md btn-swh" href="' + cooking_task.fetch_url +
+                      '"><i class="fa fa-download fa-fw" aria-hidden="true"></i>Download</a>';
+          }
+          table_row += '<td class="vault-dl-link" style="width: 320px">' + dl_link + '</td>';
+          table_row += '</tr>';
+          table.append(table_row);
         } else {
-          table_row += '<td><i class="octicon octicon-git-commit fa-fw"></i>revision</td>';
-        }
-        table_row += '<td><a href="' + browse_url + '">' + cooking_task.object_id + '</a></td>';
-        table_row += '<td>' + (cooking_task.email || 'none') + '</td>';
-        table_row += '<td>' + progress_bar.outerHTML + '</td>';
-        var dl_link = 'Waiting for download link to be available';
-        if (cooking_task.status == 'done') {
-          dl_link = '<a class="btn btn-md btn-swh" href="' + cooking_task.fetch_url +
-                    '"><i class="fa fa-download fa-fw" aria-hidden="true"></i>Download</a>';
+          var progress_bar = row_task.find('.progress-bar');
+          update_progress_bar(progress_bar, cooking_task);
+          var dl_link = row_task.find('.vault-dl-link');
+          var dl_link = row_task.find('.vault-dl-link');
+          if (cooking_task.status == 'done') {
+            dl_link[0].innerHTML = '<a class="btn btn-md btn-swh" href="' + cooking_task.fetch_url +
+                                   '"><i class="fa fa-download fa-fw" aria-hidden="true"></i>Download</a>';
+          }
         }
-        table_row += '<td  style="width: 320px">' + dl_link + '</td>';
-        table_row += '</tr>';
-        table.append(table_row);
       }
       sessionStorage.setItem("swh-vault-cooking-tasks", JSON.stringify(vault_cooking_tasks));
       check_vault_id = setTimeout(check_vault_cooking_tasks, polling_interval);
     });
   }
 
   var polling_interval = 5000;
 
   var check_vault_id = setTimeout(check_vault_cooking_tasks, polling_interval);
 
   $(document).on('shown.bs.tab', 'a[data-toggle="tab"]', function (e) {
     if (e.target.text == 'Vault') {
       clearTimeout(check_vault_id);
       check_vault_cooking_tasks();
     }
   });
 
 </script>
\ No newline at end of file