diff --git a/app/modules/web/Controllers/ConfigBackup/DownloadBackupController.php b/app/modules/web/Controllers/ConfigBackup/DownloadBackupAppController.php
similarity index 95%
rename from app/modules/web/Controllers/ConfigBackup/DownloadBackupController.php
rename to app/modules/web/Controllers/ConfigBackup/DownloadBackupAppController.php
index 187eecc1..bb5d85e2 100644
--- a/app/modules/web/Controllers/ConfigBackup/DownloadBackupController.php
+++ b/app/modules/web/Controllers/ConfigBackup/DownloadBackupAppController.php
@@ -31,7 +31,6 @@ use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Context\SessionContext;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
-use SP\Core\Exceptions\SessionTimeout;
 use SP\Domain\Export\Services\BackupFiles;
 use SP\Infrastructure\File\FileHandler;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
@@ -40,7 +39,7 @@ use SP\Modules\Web\Controllers\Traits\JsonTrait;
 /**
  * Class DownloadBackupController
  */
-final class DownloadBackupController extends SimpleControllerBase
+final class DownloadBackupAppController extends SimpleControllerBase
 {
     use JsonTrait;
 
@@ -99,8 +98,8 @@ final class DownloadBackupController extends SimpleControllerBase
     /**
      * initialize
      *
-     * @throws SessionTimeout
-     * @throws \JsonException
+     * @throws \SP\Core\Exceptions\SPException
+     * @throws \SP\Core\Exceptions\SessionTimeout
      */
     protected function initialize(): void
     {
diff --git a/app/modules/web/Controllers/ConfigBackup/DownloadBackupDbController.php b/app/modules/web/Controllers/ConfigBackup/DownloadBackupDbController.php
index 980a7072..8af1179c 100644
--- a/app/modules/web/Controllers/ConfigBackup/DownloadBackupDbController.php
+++ b/app/modules/web/Controllers/ConfigBackup/DownloadBackupDbController.php
@@ -100,8 +100,8 @@ final class DownloadBackupDbController extends SimpleControllerBase
     /**
      * initialize
      *
-     * @throws SessionTimeout
-     * @throws \JsonException
+     * @throws \SP\Core\Exceptions\SPException
+     * @throws \SP\Core\Exceptions\SessionTimeout
      */
     protected function initialize(): void
     {
diff --git a/app/modules/web/Controllers/ConfigBackup/DownloadExportController.php b/app/modules/web/Controllers/ConfigBackup/DownloadExportController.php
index 0b2ee789..b8e5c765 100644
--- a/app/modules/web/Controllers/ConfigBackup/DownloadExportController.php
+++ b/app/modules/web/Controllers/ConfigBackup/DownloadExportController.php
@@ -98,8 +98,8 @@ final class DownloadExportController extends SimpleControllerBase
     /**
      * initialize
      *
-     * @throws SessionTimeout
-     * @throws \JsonException
+     * @throws \SP\Core\Exceptions\SPException
+     * @throws \SP\Core\Exceptions\SessionTimeout
      */
     protected function initialize(): void
     {
diff --git a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php
index 877cc6d5..8b356f5b 100644
--- a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php
+++ b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php
@@ -60,7 +60,7 @@ final class FileBackupController extends SimpleControllerBase
 
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function fileBackupAction(): bool
     {
@@ -96,8 +96,8 @@ final class FileBackupController extends SimpleControllerBase
     /**
      * initialize
      *
-     * @throws SessionTimeout
-     * @throws \JsonException
+     * @throws \SP\Core\Exceptions\SPException
+     * @throws \SP\Core\Exceptions\SessionTimeout
      */
     protected function initialize(): void
     {
diff --git a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php
index 710e6399..627425f4 100644
--- a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php
+++ b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php
@@ -63,7 +63,7 @@ final class XmlExportController extends SimpleControllerBase
 
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws \SP\Core\Exceptions\SPException
      */
     public function xmlExportAction(): bool
     {
@@ -132,8 +132,8 @@ final class XmlExportController extends SimpleControllerBase
     /**
      * initialize
      *
-     * @throws SessionTimeout
-     * @throws \JsonException
+     * @throws \SP\Core\Exceptions\SPException
+     * @throws \SP\Core\Exceptions\SessionTimeout
      */
     protected function initialize(): void
     {
diff --git a/lib/SP/Domain/Export/Services/XmlVerifyService.php b/lib/SP/Domain/Export/Services/XmlVerifyService.php
index 01d76bfb..b48e906d 100644
--- a/lib/SP/Domain/Export/Services/XmlVerifyService.php
+++ b/lib/SP/Domain/Export/Services/XmlVerifyService.php
@@ -72,10 +72,7 @@ final class XmlVerifyService extends Service implements XmlVerifyServiceInterfac
 
         self::checkVersion($version);
 
-        self::checkXmlHash(
-            $this->xml,
-            $this->config->getConfigData()->getPasswordSalt()
-        );
+        self::checkXmlHash($this->xml, $this->config->getConfigData()->getPasswordSalt());
 
         return new VerifyResult(
             $version,
diff --git a/schemas/syspass.xsd b/schemas/syspass.xsd
index 1803e21b..12dee3c3 100644
--- a/schemas/syspass.xsd
+++ b/schemas/syspass.xsd
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ sysPass
+  ~
+  ~ @author nuxsmin
+  ~ @link https://syspass.org
+  ~ @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+  ~
+  ~ This file is part of sysPass.
+  ~
+  ~ sysPass is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ sysPass is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:attribute name="id" type="xs:integer"/>
     <xs:simpleType name="NonEmptyString">
@@ -89,7 +112,7 @@
     <xs:element name="Clients">
         <xs:complexType>
             <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="Client"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Client"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -112,7 +135,7 @@
     <xs:element name="Accounts">
         <xs:complexType>
             <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="Account"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Account"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>