From f77e68f1a9977fc9e13ed8538e23c417f57b2672 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 1 Mar 2021 17:56:16 +0100
Subject: [PATCH 1/2] Fix type error

---
 www/settings/inner.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/settings/inner.js b/www/settings/inner.js
index 6ee8d4854..82e3086e2 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1568,6 +1568,7 @@ define([
             .appendTo(APP.$leftside);
         APP.$usage = $('<div>', { 'class': 'usage' }).appendTo(APP.$leftside);
         var active = privateData.category || 'account';
+        if (!categories[active]) { active = 'account'; }
         Object.keys(categories).forEach(function(key) {
             var $category = $('<div>', {
                 'class': 'cp-sidebarlayout-category',

From c70f3888e0ed135ecf86710e89d231f5b3fc40b0 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 2 Mar 2021 10:44:34 +0100
Subject: [PATCH 2/2] Fix spinner not removed when account deletio is canceled

---
 www/settings/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/settings/inner.js b/www/settings/inner.js
index 82e3086e2..8feef06e4 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -487,7 +487,7 @@ define([
         $button.click(function() {
             $spinner.show();
             UI.confirm(Messages.settings_deleteConfirm, function(yes) {
-                if (!yes) { return; }
+                if (!yes) { return void $spinner.hide(); }
                 sframeChan.query("Q_SETTINGS_DELETE_ACCOUNT", null, function(err, data) {
                     // Owned drive
                     if (data.state === true) {