diff --git a/app/modules/web/Controllers/ConfigManagerController.php b/app/modules/web/Controllers/ConfigManagerController.php
index a2efa3e0..dbd33ba4 100644
--- a/app/modules/web/Controllers/ConfigManagerController.php
+++ b/app/modules/web/Controllers/ConfigManagerController.php
@@ -24,17 +24,27 @@
 
 namespace SP\Modules\Web\Controllers;
 
+use SP\Bootstrap;
 use SP\Core\Acl\Acl;
 use SP\Core\Acl\ActionsInterface;
+use SP\Core\Crypt\CryptSessionHandler;
+use SP\Core\CryptMasterPass;
 use SP\Core\Language;
+use SP\Core\Plugin\PluginUtil;
+use SP\Core\Task;
 use SP\Http\Request;
 use SP\Modules\Web\Controllers\Helpers\TabsHelper;
 use SP\Mvc\View\Components\DataTab;
 use SP\Mvc\View\Components\SelectItemAdapter;
+use SP\Services\Account\AccountService;
+use SP\Services\Config\ConfigService;
 use SP\Services\User\UserService;
 use SP\Services\UserGroup\UserGroupService;
 use SP\Services\UserProfile\UserProfileService;
+use SP\Storage\DBUtil;
+use SP\Storage\MySQLHandler;
 use SP\Util\Checks;
+use SP\Util\Util;
 
 /**
  * Class ConfigManagerController
@@ -52,6 +62,7 @@ class ConfigManagerController extends ControllerBase
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      * @throws \SP\Core\Exceptions\InvalidArgumentException
+     * @throws \SP\Services\Config\ParameterNotFoundException
      */
     public function indexAction()
     {
@@ -64,6 +75,7 @@ class ConfigManagerController extends ControllerBase
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      * @throws \SP\Core\Exceptions\InvalidArgumentException
+     * @throws \SP\Services\Config\ParameterNotFoundException
      */
     protected function getTabs()
     {
@@ -90,15 +102,19 @@ class ConfigManagerController extends ControllerBase
         }
 
         if ($this->checkAccess(ActionsInterface::ENCRYPTION_CONFIG)) {
-//            $this->tabsHelper->addTab($this->getEncryptionConfig());
+            $this->tabsHelper->addTab($this->getEncryptionConfig());
         }
 
         if ($this->checkAccess(ActionsInterface::BACKUP_CONFIG)) {
-//            $this->tabsHelper->addTab($this->getBackupConfig());
+            $this->tabsHelper->addTab($this->getBackupConfig());
         }
 
         if ($this->checkAccess(ActionsInterface::IMPORT_CONFIG)) {
-//            $this->tabsHelper->addTab($this->getImportConfig());
+            $this->tabsHelper->addTab($this->getImportConfig());
+        }
+
+        if ($this->checkAccess(ActionsInterface::CONFIG_GENERAL)) {
+            $this->tabsHelper->addTab($this->getInfo());
         }
 
 
@@ -135,14 +151,6 @@ class ConfigManagerController extends ControllerBase
         return new DataTab(__('General'), $template);
     }
 
-    /**
-     * @return TabsHelper
-     */
-    public function getTabsHelper()
-    {
-        return $this->tabsHelper;
-    }
-
     /**
      * @return DataTab
      */
@@ -213,28 +221,130 @@ class ConfigManagerController extends ControllerBase
      * @return DataTab
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws \SP\Services\Config\ParameterNotFoundException
      */
     protected function getEncryptionConfig()
     {
         $template = clone $this->view;
         $template->setBase('config');
-        $template->addTemplate('mail');
+        $template->addTemplate('encryption');
 
         $template->assign('mailSecurity', ['SSL', 'TLS']);
         $template->assign('configData', $this->configData);
 
-        $this->view->assign('numAccounts', AccountUtil::getTotalNumAccounts());
-        $this->view->assign('taskId', Task::genTaskId('masterpass'));
+        $template->assign('numAccounts', $this->dic->get(AccountService::class)->getTotalNumAccounts());
+        $template->assign('taskId', Task::genTaskId('masterpass'));
 
-        $this->view->assign('lastUpdateMPass', isset($this->configDB['lastupdatempass']) ? $this->configDB['lastupdatempass'] : 0);
-        $this->view->assign('tempMasterPassTime', isset($this->configDB['tempmaster_passtime']) ? $this->configDB['tempmaster_passtime'] : 0);
-        $this->view->assign('tempMasterMaxTime', isset($this->configDB['tempmaster_maxtime']) ? $this->configDB['tempmaster_maxtime'] : 0);
-        $this->view->assign('tempMasterAttempts', isset($this->configDB['tempmaster_attempts']) ? sprintf('%d/%d', $this->configDB['tempmaster_attempts'], CryptMasterPass::MAX_ATTEMPTS) : 0);
-        $this->view->assign('tempMasterPass', SessionFactory::getTemporaryMasterPass());
+        $configService = $this->dic->get(ConfigService::class);
+
+        $template->assign('lastUpdateMPass', $configService->getByParam('lastupdatempass', 0));
+        $template->assign('tempMasterPassTime', $configService->getByParam('tempmaster_passtime', 0));
+        $template->assign('tempMasterMaxTime', $configService->getByParam('tempmaster_maxtime', 0));
+
+        $tempMasterAttempts = sprintf('%d/%d', $configService->getByParam('tempmaster_attempts', 0), CryptMasterPass::MAX_ATTEMPTS);
+
+        $template->assign('tempMasterAttempts', $tempMasterAttempts);
+        $template->assign('tempMasterPass', $this->session->getTemporaryMasterPass());
 
         $template->assign('userGroups', SelectItemAdapter::factory(UserGroupService::getItemsBasic())->getItemsFromModel());
-        $template->assign('userProfiles', SelectItemAdapter::factory(UserProfileService::getItemsBasic())->getItemsFromModel());
 
         return new DataTab(__('Encriptación'), $template);
     }
+
+    /**
+     * @return DataTab
+     */
+    protected function getBackupConfig()
+    {
+        $template = clone $this->view;
+        $template->setBase('config');
+        $template->addTemplate('backup');
+
+        $template->assign('siteName', Util::getAppInfo('appname'));
+        $template->assign('backupDir', Bootstrap::$SERVERROOT . '/backup');
+        $template->assign('backupPath', Bootstrap::$WEBROOT . '/backup');
+
+        $backupHash = $this->configData->getBackupHash();
+        $exportHash = $this->configData->getExportHash();
+
+        $backupFile = $template->siteName . '-' . $backupHash . '.tar.gz';
+
+        $template->assign('backupFile', [
+            'absolute' => $template->backupDir . DIRECTORY_SEPARATOR . $backupFile,
+            'relative' => $template->backupPath . '/' . $backupFile,
+            'filename' => $backupFile
+        ]);
+
+        $backupDbFile = $template->siteName . '_db-' . $backupHash . '.sql';
+
+        $template->assign('backupDbFile', [
+            'absolute' => $template->backupDir . DIRECTORY_SEPARATOR . $backupDbFile,
+            'relative' => $template->backupPath . '/' . $backupDbFile,
+            'filename' => $backupDbFile
+        ]);
+
+        clearstatcache(true, $template->backupFile['absolute']);
+        clearstatcache(true, $template->backupDbFile['absolute']);
+
+        $template->assign('lastBackupTime', file_exists($template->backupFile['absolute']) ? __('Último backup') . ': ' . date('r', filemtime($template->backupFile['absolute'])) : __('No se encontraron backups'));
+
+        $exportFile = $template->siteName . '-' . $exportHash . '.xml';
+
+        $template->assign('exportFile', [
+            'absolute' => $template->backupDir . DIRECTORY_SEPARATOR . $exportFile,
+            'relative' => $template->backupPath . '/' . $exportFile,
+            'filename' => $exportFile
+        ]);
+
+        clearstatcache(true, $template->exportFile['absolute']);
+
+        $template->assign('lastExportTime', file_exists($template->exportFile['absolute']) ? __('Última exportación') . ': ' . date('r', filemtime($template->exportFile['absolute'])) : __('No se encontró archivo de exportación'));
+
+        return new DataTab(__('Copia de Seguridad'), $template);
+    }
+
+    /**
+     * @return DataTab
+     * @throws \Psr\Container\ContainerExceptionInterface
+     * @throws \Psr\Container\NotFoundExceptionInterface
+     */
+    protected function getImportConfig()
+    {
+        $template = clone $this->view;
+        $template->setBase('config');
+        $template->addTemplate('import');
+
+        $template->assign('userGroups', SelectItemAdapter::factory(UserGroupService::getItemsBasic())->getItemsFromModelSelected([$this->userData->getUserGroupId()]));
+        $template->assign('users', SelectItemAdapter::factory(UserService::getItemsBasic())->getItemsFromModelSelected([$this->userData->getId()]));
+
+        return new DataTab(__('Importar Cuentas'), $template);
+    }
+
+    /**
+     * @return DataTab
+     * @throws \SP\Core\Exceptions\SPException
+     */
+    protected function getInfo()
+    {
+        $template = clone $this->view;
+        $template->setBase('config');
+        $template->addTemplate('info');
+
+        $template->assign('dbInfo', DBUtil::getDBinfo($this->dic->get(MySQLHandler::class)));
+        $template->assign('dbName', $this->configData->getDbName() . '@' . $this->configData->getDbHost());
+        $template->assign('configBackupDate', date('r', $this->dic->get(ConfigService::class)->getByParam('config_backupdate', 0)));
+        $template->assign('plugins', PluginUtil::getLoadedPlugins());
+        $template->assign('locale', Language::$localeStatus ?: sprintf('%s (%s)', $this->configData->getSiteLang(), __('No instalado')));
+        $template->assign('securedSession', CryptSessionHandler::$isSecured);
+
+        return new DataTab(__('Información'), $template);
+    }
+
+    /**
+     * @return TabsHelper
+     */
+    public function getTabsHelper()
+    {
+        return $this->tabsHelper;
+    }
 }
\ No newline at end of file
diff --git a/app/modules/web/themes/material-blue/views/config/accounts.inc b/app/modules/web/themes/material-blue/views/config/accounts.inc
index f2788f26..a536a8ca 100644
--- a/app/modules/web/themes/material-blue/views/config/accounts.inc
+++ b/app/modules/web/themes/material-blue/views/config/accounts.inc
@@ -303,9 +303,6 @@
             </td>
         </tr>
     </table>
-
-    <input type="hidden" name="sk" value="">
-    <input type="hidden" name="isAjax" value="1"/>
 </form>
 
 <div class="tab-actions">
diff --git a/app/modules/web/themes/material-blue/views/config/backup.inc b/app/modules/web/themes/material-blue/views/config/backup.inc
index ac2a1608..19788c1d 100644
--- a/app/modules/web/themes/material-blue/views/config/backup.inc
+++ b/app/modules/web/themes/material-blue/views/config/backup.inc
@@ -1,199 +1,182 @@
 <?php /** @var $icons \Theme\Icons */ ?>
 
-<!-- Start Tab - Backup -->
-<div id="tabs-<?php echo $backup_tabIndex; ?>" class="mdl-tabs__panel">
-    <div class="tab-data">
-        <div id="title" class="midroundup titleNormal">
-            <?php echo __('Copia de Seguridad'); ?>
-        </div>
+<div id="title" class="midroundup titleNormal">
+    <?php echo __('Copia de Seguridad'); ?>
+</div>
 
-        <table class="data round">
+<table class="data round">
+    <tr>
+        <td class="descField">
+            <?php echo __('Resultado'); ?>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('Resultado'); ?></div>
+
+            <?php echo $lastBackupTime; ?>
+        </td>
+    </tr>
+    <?php if ($userIsAdminApp): ?>
+        <tr>
+            <td class="descField">
+                <?php echo __('Descargar Actual'); ?>
+            </td>
+            <td class="valField">
+                <div class="lowres-title"><?php echo __('Descargar Actual'); ?></div>
+
+                <?php if (file_exists($backupFile['absolute']) && file_exists($backupDbFile['absolute'])): ?>
+                    <a href="<?php echo $backupDbFile['relative']; ?>"
+                       download="<?php echo $backupDbFile['filename']; ?>" class="download">
+                        <button type="button" class="mdl-button mdl-js-button">
+                            <?php echo __('Copia BBDD'); ?>
+                        </button>
+                    </a>
+
+                    <a href="<?php echo $backupFile['relative']; ?>"
+                       download="<?php echo $backupFile['filename']; ?>" class="download">
+                        <button type="button" class="mdl-button mdl-js-button">
+                            <?php echo __('Copia sysPass'); ?>
+                        </button>
+                    </a>
+                <?php else: echo __('No hay backups para descargar'); ?>
+                <?php endif; ?>
+            </td>
+        </tr>
+    <?php endif; ?>
+</table>
+
+<form method="post" name="frmBackup" id="frmBackup" class="form-action"
+      data-onsubmit="config/backup">
+</form>
+
+<div class="tab-actions">
+    <ul>
+        <li>
+            <button id="help_backup_button" type="button"
+                    class="btn-help mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
+                    title="<?php echo $icons->getIconHelp()->getTitle(); ?>"
+                    data-help="help_backup">
+                <i class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
+            </button>
+
+            <div id="help_backup" class="help-box" title="<?php echo __('Ayuda'); ?>">
+                <p class="help-text"><?php echo __('La copia de seguridad permite guardar y descargar tanto la base de datos de sysPass como los archivos de la aplicación y su configuración.'); ?></p>
+
+                <p class="help-text"><?php echo __('Con este método es posible guardar todos los datos de sysPass en otro lugar o utilizarlos para hacer la aplicación portable.'); ?></p>
+            </div>
+        </li>
+        <li>
+
+            <button form="frmBackup"
+                    class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconPlay()->getClassButton(); ?>"
+                    title="<?php echo $icons->getIconPlay()->getTitle(); ?>">
+                <i class="material-icons"><?php echo $icons->getIconPlay()->getIcon(); ?></i>
+            </button>
+        </li>
+    </ul>
+</div>
+
+<div id="title" class="midroundup titleNormal">
+    <?php echo __('Exportar Cuentas'); ?>
+</div>
+
+<form method="post" name="frmExport" id="frmExport" class="form-action"
+      data-onsubmit="config/export">
+    <table class="data round">
+        <tr>
+            <td class="descField">
+                <?php echo __('Resultado'); ?>
+            </td>
+            <td class="valField">
+                <div class="lowres-title"><?php echo __('Resultado'); ?></div>
+
+                <?php echo $lastExportTime; ?>
+            </td>
+        </tr>
+        <?php if ($userIsAdminApp): ?>
             <tr>
                 <td class="descField">
-                    <?php echo __('Resultado'); ?>
+                    <?php echo __('Descargar Actual'); ?>
                 </td>
                 <td class="valField">
-                    <div class="lowres-title"><?php echo __('Resultado'); ?></div>
+                    <div class="lowres-title"><?php echo __('Descargar Actual'); ?></div>
 
-                    <?php echo $lastBackupTime; ?>
+                    <?php if (file_exists($exportFile['absolute'])): ?>
+                        <a href="<?php echo $exportFile['relative']; ?>"
+                           download="<?php echo $exportFile['filename']; ?>"
+                           class="download">
+                            <button type="button" class="mdl-button mdl-js-button">
+                                XML <?php echo $siteName; ?>
+                            </button>
+                        </a>
+                    <?php else: echo __('No hay archivos XML para descargar'); ?>
+                    <?php endif; ?>
                 </td>
             </tr>
-            <?php if ($isAdminApp): ?>
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Descargar Actual'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="lowres-title"><?php echo __('Descargar Actual'); ?></div>
+        <?php endif; ?>
+        <tr>
+            <td class="descField">
+                <?php echo __('Clave de Exportación'); ?>
+            </td>
+            <td class="valField">
+                <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                    <input id="exportPwd" name="exportPwd" type="password"
+                           class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__input"
+                           maxlength="255"/>
+                    <label class="mdl-textfield__label"
+                           for="exportPwd"><?php echo __('Clave de Exportación'); ?></label>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td class="descField">
+                <?php echo __('Clave de Exportación (repetir)'); ?>
+            </td>
+            <td class="valField">
+                <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                    <input id="exportPwdR" name="exportPwdR" type="password"
+                           class="mdl-textfield__input mdl-color-text--indigo-400"
+                           maxlength="255"/>
+                    <label class="mdl-textfield__label"
+                           for="exportPwdR"><?php echo __('Clave de Exportación (repetir)'); ?></label>
+                </div>
+            </td>
+        </tr>
+    </table>
+</form>
 
-                        <?php if (file_exists($backupFile['absolute']) && file_exists($backupDbFile['absolute'])): ?>
-                            <a href="<?php echo $backupDbFile['relative']; ?>"
-                               download="<?php echo $backupDbFile['filename']; ?>" class="download">
-                                <button type="button" class="mdl-button mdl-js-button">
-                                    <?php echo __('Copia BBDD'); ?>
-                                </button>
-                            </a>
+<div class="tab-actions">
+    <ul>
+        <li>
+            <button id="btnBack" type="button"
+                    class="btn-back mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconBack()->getClassButton(); ?>"
+                    title="<?php echo __('Atrás'); ?>">
+                <i class="material-icons"><?php echo $icons->getIconBack()->getIcon(); ?></i>
+            </button>
+        </li>
+        <li>
+            <button id="help_export_button" type="button"
+                    class="btn-help mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
+                    title="<?php echo $icons->getIconHelp()->getTitle(); ?>"
+                    data-help="help_export">
+                <i class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
+            </button>
 
-                            <a href="<?php echo $backupFile['relative']; ?>"
-                               download="<?php echo $backupFile['filename']; ?>" class="download">
-                                <button type="button" class="mdl-button mdl-js-button">
-                                    <?php echo __('Copia sysPass'); ?>
-                                </button>
-                            </a>
-                        <?php else: echo __('No hay backups para descargar'); ?>
-                        <?php endif; ?>
-                    </td>
-                </tr>
-            <?php endif; ?>
-        </table>
+            <div id="help_export" class="help-box" title="<?php echo $icons->getIconHelp()->getTitle(); ?>">
+                <p class="help-text"><?php echo __('La exportación de cuentas permite guardar las cuentas y sus datos en formato XML para posteriormente poder ser importados en otras instancias de sysPass.'); ?></p>
 
-        <form method="post" name="frmBackup" id="frmBackup" class="form-action"
-              data-onsubmit="config/backup"
-              data-nextaction-id="<?php echo \SP\Core\ActionsInterface::BACKUP; ?>"
-              data-activetab="<?php echo $backup_tabIndex; ?>">
+                <p class="help-text"><?php echo __('Los elementos exportados son cuentas, clientes, categorías y etiquetas.'); ?></p>
 
-            <input type="hidden" name="isAjax" value="1"/>
-            <input type="hidden" name="actionId" value="<?php echo \SP\Core\ActionsInterface::BACKUP; ?>"/>
-            <input type="hidden" name="sk" value="<?php echo $sk; ?>">
-        </form>
+                <p class="help-text"><?php echo __('Las claves de las cuentas son exportadas de forma encriptada para mayor seguridad.'); ?></p>
 
-        <div class="tab-actions">
-            <ul>
-                <li>
-                    <button id="help_backup_button" type="button"
-                            class="btn-help mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
-                            title="<?php echo $icons->getIconHelp()->getTitle(); ?>"
-                            data-help="help_backup">
-                        <i class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
-                    </button>
-
-                    <div id="help_backup" class="help-box" title="<?php echo __('Ayuda'); ?>">
-                        <p class="help-text"><?php echo __('La copia de seguridad permite guardar y descargar tanto la base de datos de sysPass como los archivos de la aplicación y su configuración.'); ?></p>
-
-                        <p class="help-text"><?php echo __('Con este método es posible guardar todos los datos de sysPass en otro lugar o utilizarlos para hacer la aplicación portable.'); ?></p>
-                    </div>
-                </li>
-                <li>
-
-                    <button form="frmBackup"
-                            class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconPlay()->getClassButton(); ?>"
-                            title="<?php echo $icons->getIconPlay()->getTitle(); ?>">
-                        <i class="material-icons"><?php echo $icons->getIconPlay()->getIcon(); ?></i>
-                    </button>
-                </li>
-            </ul>
-        </div>
-
-        <div id="title" class="midroundup titleNormal">
-            <?php echo __('Exportar Cuentas'); ?>
-        </div>
-
-        <form method="post" name="frmExport" id="frmExport" class="form-action"
-              data-onsubmit="config/export"
-              data-nextaction-id="<?php echo \SP\Core\ActionsInterface::EXPORT; ?>"
-              data-activetab="<?php echo $backup_tabIndex; ?>">
-            <table class="data round">
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Resultado'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="lowres-title"><?php echo __('Resultado'); ?></div>
-
-                        <?php echo $lastExportTime; ?>
-                    </td>
-                </tr>
-                <?php if ($isAdminApp): ?>
-                    <tr>
-                        <td class="descField">
-                            <?php echo __('Descargar Actual'); ?>
-                        </td>
-                        <td class="valField">
-                            <div class="lowres-title"><?php echo __('Descargar Actual'); ?></div>
-
-                            <?php if (file_exists($exportFile['absolute'])): ?>
-                                <a href="<?php echo $exportFile['relative']; ?>"
-                                   download="<?php echo $exportFile['filename']; ?>"
-                                   class="download">
-                                    <button type="button" class="mdl-button mdl-js-button">
-                                        XML <?php echo $siteName; ?>
-                                    </button>
-                                </a>
-                            <?php else: echo __('No hay archivos XML para descargar'); ?>
-                            <?php endif; ?>
-                        </td>
-                    </tr>
-                <?php endif; ?>
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Clave de Exportación'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                            <input id="exportPwd" name="exportPwd" type="password"
-                                   class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__input"
-                                   maxlength="255"/>
-                            <label class="mdl-textfield__label"
-                                   for="exportPwd"><?php echo __('Clave de Exportación'); ?></label>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Clave de Exportación (repetir)'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                            <input id="exportPwdR" name="exportPwdR" type="password"
-                                   class="mdl-textfield__input mdl-color-text--indigo-400"
-                                   maxlength="255"/>
-                            <label class="mdl-textfield__label"
-                                   for="exportPwdR"><?php echo __('Clave de Exportación (repetir)'); ?></label>
-                        </div>
-                    </td>
-                </tr>
-            </table>
-
-            <input type="hidden" name="actionId" value="<?php echo \SP\Core\ActionsInterface::EXPORT; ?>"/>
-            <input type="hidden" name="sk" value="">
-            <input type="hidden" name="isAjax" value="1"/>
-        </form>
-
-        <div class="tab-actions">
-            <ul>
-                <li>
-                    <button id="btnBack" type="button"
-                            class="btn-back mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconBack()->getClassButton(); ?>"
-                            title="<?php echo __('Atrás'); ?>">
-                        <i class="material-icons"><?php echo $icons->getIconBack()->getIcon(); ?></i>
-                    </button>
-                </li>
-                <li>
-                    <button id="help_export_button" type="button"
-                            class="btn-help mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
-                            title="<?php echo $icons->getIconHelp()->getTitle(); ?>"
-                            data-help="help_export">
-                        <i class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
-                    </button>
-
-                    <div id="help_export" class="help-box" title="<?php echo $icons->getIconHelp()->getTitle(); ?>">
-                        <p class="help-text"><?php echo __('La exportación de cuentas permite guardar las cuentas y sus datos en formato XML para posteriormente poder ser importados en otras instancias de sysPass.'); ?></p>
-
-                        <p class="help-text"><?php echo __('Los elementos exportados son cuentas, clientes, categorías y etiquetas.'); ?></p>
-
-                        <p class="help-text"><?php echo __('Las claves de las cuentas son exportadas de forma encriptada para mayor seguridad.'); ?></p>
-
-                        <p class="help-text"><?php echo __('Es posible establecer una clave de exportación para guardar todos los datos encriptados en el archivo XML.'); ?></p>
-                    </div>
-                </li>
-                <li>
-                    <button form="frmExport"
-                            class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconPlay()->getClassButton(); ?>"
-                            title="<?php echo $icons->getIconPlay()->getTitle(); ?>">
-                        <i class="material-icons"><?php echo $icons->getIconPlay()->getIcon(); ?></i>
-                    </button>
-                </li>
-            </ul>
-        </div>
-    </div>
-</div> <!-- End Tab - Backup -->
\ No newline at end of file
+                <p class="help-text"><?php echo __('Es posible establecer una clave de exportación para guardar todos los datos encriptados en el archivo XML.'); ?></p>
+            </div>
+        </li>
+        <li>
+            <button form="frmExport"
+                    class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconPlay()->getClassButton(); ?>"
+                    title="<?php echo $icons->getIconPlay()->getTitle(); ?>">
+                <i class="material-icons"><?php echo $icons->getIconPlay()->getIcon(); ?></i>
+            </button>
+        </li>
+    </ul>
+</div>
diff --git a/app/modules/web/themes/material-blue/views/config/encryption.inc b/app/modules/web/themes/material-blue/views/config/encryption.inc
index 3e9259f5..ae3b3847 100644
--- a/app/modules/web/themes/material-blue/views/config/encryption.inc
+++ b/app/modules/web/themes/material-blue/views/config/encryption.inc
@@ -1,316 +1,303 @@
 <?php /** @var $icons \Theme\Icons */ ?>
 
-<!-- Start Tab - Encryption -->
-<div id="tabs-<?php echo $encryption_tabIndex; ?>" class="mdl-tabs__panel">
-    <div class="tab-data">
+<form method="post" name="frmCrypt" id="frmCrypt" class="form-action" data-onsubmit="config/masterpass"
+      data-type="masterpass"
+      data-hash="">
 
-        <div id="title" class="midroundup titleNormal">
-            <?php echo __('Clave Maestra'); ?>
-        </div>
-
-        <form method="post" name="frmCrypt" id="frmCrypt" class="form-action" data-onsubmit="config/masterpass"
-              data-type="masterpass"
-              data-hash="">
-            <table class="data tblConfig round">
-                <?php if ($lastUpdateMPass > 0): ?>
-                    <tr>
-                        <td class="descField">
-                            <?php echo __('Último cambio'); ?>
-                        </td>
-                        <td class="valField">
-                            <div class="lowres-title"><?php echo __('Último cambio'); ?></div>
-
-                            <?php echo date('r', $lastUpdateMPass); ?>
-                        </td>
-                    </tr>
-                <?php endif; ?>
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Clave Maestra actual'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                            <input id="curMasterPwd" name="curMasterPwd" type="password"
-                                   class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__input-show"
-                                   maxlength="255" required/>
-                            <label class="mdl-textfield__label"
-                                   for="curMasterPwd"><?php echo __('Clave Maestra actual'); ?></label>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Nueva Clave Maestra'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                            <input id="newMasterPwd" name="newMasterPwd" type="password"
-                                   class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__input"
-                                   maxlength="255" required/>
-                            <label class="mdl-textfield__label"
-                                   for="newMasterPwd"><?php echo __('Nueva Clave Maestra'); ?></label>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Nueva Clave Maestra (repetir)'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                            <input id="newMasterPwdR" name="newMasterPwdR" type="password"
-                                   class="mdl-textfield__input mdl-color-text--indigo-400"
-                                   maxlength="255" required/>
-                            <label class="mdl-textfield__label"
-                                   for="newMasterPwdR"><?php echo __('Nueva Clave Maestra (repetir)'); ?></label>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="descField">
-                        <div id="help-chkNoAccountChange"
-                             class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
-                        <div class="mdl-tooltip mdl-tooltip--large" for="help-chkNoAccountChange">
-                            <p>
-                                <?php echo __('Establece una nueva clave maestra sin re-encriptar las cuentas'); ?>
-                            </p>
-                        </div>
-                    </td>
-                    <td class="valField">
-                        <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="chkNoAccountChange">
-                            <input type="checkbox" id="chkNoAccountChange"
-                                   class="mdl-switch__input mdl-color-text--indigo-400" name="chkNoAccountChange"/>
-                            <span class="mdl-switch__label"><?php echo __('No modificar cuentas'); ?></span>
-                        </label>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="descField"></td>
-                    <td class="valField">
-                        <div
-                                class="icon material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></div>
-                        <?php echo __('Guarde la nueva clave en un lugar seguro.'); ?>
-                        <br>
-                        <div
-                                class="icon material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></div>
-                        <?php echo __('Se volverán a encriptar las claves de todas las cuentas.'); ?>
-                        <br>
-                        <div
-                                class="icon material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></div>
-                        <?php echo __('Los usuarios deberán de introducir la nueva clave maestra.'); ?>
-                        <br>
-                        <div
-                                class="icon material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></div>
-                        <strong><?php printf(__('Se van a actualizar %s cuentas. Este proceso puede tardar algo de tiempo.'), $numAccounts); ?></strong>
-                        <br>
-                        <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="confirmPassChange">
-                            <input type="checkbox" id="confirmPassChange" class="mdl-switch__input"
-                                   name="confirmPassChange"/>
-                            <span class="mdl-switch__label"><?php echo __('Confirmar cambio'); ?></span>
-                        </label>
-                    </td>
-                </tr>
-            </table>
-
-            <?php if ($numAccounts >= 500): ?>
-                <input type="hidden" name="useTask" value="1">
-                <input type="hidden" name="taskId" value="<?php echo $taskId; ?>">
-                <input type="hidden" name="lock" value="masterpass">
-            <?php endif; ?>
-
-            <input type="hidden" name="activeTab" value="<?php echo $encryption_tabIndex; ?>"/>
-            <input type="hidden" name="actionId"
-                   value="<?php echo \SP\Core\Acl\ActionsInterface::ENCRYPTION_CONFIG; ?>"/>
-            <input type="hidden" name="isAjax" value="1"/>
-            <input type="hidden" name="sk" value="<?php echo $sk; ?>">
-        </form>
-        <div class="tab-actions">
-            <ul>
-                <li>
-                    <button id="help_mpass_button" type="button"
-                            class="btn-help mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
-                            title="<?php echo $icons->getIconHelp()->getTitle(); ?>"
-                            data-help="help_mpass">
-                        <i class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
-                    </button>
-
-                    <div id="help_mpass" class="help-box" title="<?php echo __('Ayuda'); ?>">
-                        <p class="help-text"><?php echo __('La clave maestra es utilizada para encriptar las claves de las cuentas de sysPass para mantenerlas seguras.'); ?></p>
-
-                        <p class="help-text"><?php echo __('Es recomendable cambiarla cada cierto tiempo y utilizar una clave compleja que incluya números, letras y símbolos.'); ?></p>
-
-                        <p class="help-text"><?php printf(__('Para más información consulte: %s'), '<a target="_blank" href="https://doc.syspass.org">https://doc.syspass.org</a>'); ?></p>
-                    </div>
-                </li>
-                <?php if ($isAdminApp): ?>
-                    <li>
-                        <button type="button"
-                                class="btn-action mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconCheck()->getClassButton(); ?>"
-                                data-onclick="config/refreshMpass"
-                                data-action-id="<?php echo \SP\Core\Acl\ActionsInterface::ENCRYPTION_REFRESH; ?>"
-                                data-sk="<?php echo $sk; ?>"
-                                title="<?php echo __('Actualizar hash de clave maestra'); ?>">
-                            <i class="material-icons"><?php echo $icons->getIconRefresh()->getIcon(); ?></i>
-                        </button>
-                    </li>
-                <?php endif; ?>
-
-                <?php if ($numAccounts > 0): ?>
-                    <li>
-                        <button form="frmCrypt"
-                                class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconPlay()->getClassButton(); ?>"
-                                title="<?php echo $icons->getIconPlay()->getTitle(); ?>">
-                            <i class="material-icons"><?php echo $icons->getIconPlay()->getIcon(); ?></i>
-                        </button>
-                    </li>
-                <?php endif; ?>
-            </ul>
-        </div>
-
-        <div id="title" class="midroundup titleNormal">
-            <?php echo __('Clave Temporal'); ?>
-        </div>
-
-        <form method="post" name="frmTempMasterPass" id="frmTempMasterPass" class="form-action"
-              data-onsubmit="config/save"
-              data-type="temppass"
-              data-nextaction-id="<?php echo \SP\Core\Acl\ActionsInterface::ENCRYPTION_TEMPPASS; ?>"
-              data-activetab="<?php echo $encryption_tabIndex; ?>">
-            <table class="data tblConfig round">
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Último cambio'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="lowres-title"><?php echo __('Último cambio'); ?></div>
-
-                        <?php echo ($tempMasterPassTime > 0) ? date('r', $tempMasterPassTime) : __('No generada'); ?>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Válido hasta'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="lowres-title"><?php echo __('Válido hasta'); ?></div>
-
-                        <?php if (time() > $tempMasterMaxTime): ?>
-                            <span style="color: red"><?php echo date('r', $tempMasterMaxTime); ?></span>
-                        <?php elseif ($tempMasterMaxTime > 0): echo date('r', $tempMasterMaxTime); ?>
-                        <?php else: echo __('No generada'); ?>
-                        <?php endif; ?>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Intentos'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="lowres-title"><?php echo __('Intentos'); ?></div>
-
-                        <?php echo $tempMasterAttempts; ?>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Validez (s)'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                            <input id="tmpass_maxtime" name="tmpass_maxtime" type="number" step="600"
-                                   pattern="[0-9]{2,6}" class="mdl-textfield__input mdl-color-text--indigo-400"
-                                   value="3600"
-                                   required/>
-                            <label class="mdl-textfield__label"
-                                   for="tmpass_maxtime"><?php echo __('Validez (s)'); ?></label>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="descField">
-
-
-                        <div id="help-chkSendEmail"
-                             class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
-                        <div class="mdl-tooltip mdl-tooltip--large" for="help-chkSendEmail">
-                            <p>
-                                <?php echo __('Envía un correo a todos los usuarios o sólo a los del grupo seleccionado.'); ?>
-                            </p>
-                        </div>
-                    </td>
-                    <td class="valField">
-                        <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="tmpass_chkSendEmail">
-                            <input type="checkbox" id="tmpass_chkSendEmail"
-                                   class="mdl-switch__input mdl-color-text--indigo-400" name="tmpass_chkSendEmail"/>
-                            <span class="mdl-switch__label"><?php echo __('Enviar correo'); ?></span>
-                        </label>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="descField">
-                        <?php echo __('Grupo'); ?>
-                    </td>
-                    <td class="valField">
-                        <div class="lowres-title"><?php echo __('Grupo'); ?></div>
-
-                        <select id="tmpass_group" name="tmpass_group"
-                                class="select-box select-box-deselect">
-                            <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
-                            <?php foreach ($groups as $group): ?>
-                                <option
-                                        value="<?php echo $group->id; ?>"><?php echo $group->name; ?></option>
-                            <?php endforeach; ?>
-                        </select>
-                    </td>
-                </tr>
-                <?php if (!empty($tempMasterPass)): ?>
-                    <tr>
-                        <td class="descField">
-                            <?php echo __('Clave'); ?>
-                        </td>
-                        <td class="valField">
-                            <div class="lowres-title"><?php echo __('Clave'); ?></div>
-
-                            <?php echo $tempMasterPass; ?>
-                        </td>
-                    </tr>
-                <?php endif; ?>
-            </table>
-            <input type="hidden" name="actionId"
-                   value="<?php echo \SP\Core\Acl\ActionsInterface::ENCRYPTION_TEMPPASS; ?>"/>
-            <input type="hidden" name="sk" value="">
-            <input type="hidden" name="isAjax" value="1"/>
-        </form>
-        <div class="tab-actions">
-            <ul>
-                <li>
-                    <button id="btnBack" type="button"
-                            class="btn-back mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconBack()->getClassButton(); ?>"
-                            title="<?php echo __('Atrás'); ?>">
-                        <i class="material-icons"><?php echo $icons->getIconBack()->getIcon(); ?></i>
-                    </button>
-                </li>
-                <li>
-                    <button id="help_tmpass_button"
-                            class="btn-help mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
-                            title="<?php echo $icons->getIconHelp()->getTitle(); ?>"
-                            data-help="help_tmpass">
-                        <i class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
-                    </button>
-
-
-                    <div id="help_tmpass" class="help-box" title="<?php echo __('Ayuda'); ?>">
-                        <p class="help-text"><?php echo __('La clave temporal es utilizada como clave maestra para los usuarios que necesitan introducirla al iniciar la sesión, así no es necesario facilitar la clave maestra original.'); ?></p>
-                    </div>
-                </li>
-                <li>
-                    <button form="frmTempMasterPass"
-                            class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconPlay()->getClassButton(); ?>"
-                            title="<?php echo __('Generar'); ?>">
-                        <i class="material-icons"><?php echo $icons->getIconPlay()->getIcon(); ?></i>
-                    </button>
-                </li>
-            </ul>
-        </div>
+    <div id="title" class="midroundup titleNormal">
+        <?php echo __('Clave Maestra'); ?>
     </div>
-</div> <!-- End Tab - Encryption -->
\ No newline at end of file
+
+    <table class="data tblConfig round">
+        <?php if ($lastUpdateMPass > 0): ?>
+            <tr>
+                <td class="descField">
+                    <?php echo __('Último cambio'); ?>
+                </td>
+                <td class="valField">
+                    <div class="lowres-title"><?php echo __('Último cambio'); ?></div>
+
+                    <?php echo date('r', $lastUpdateMPass); ?>
+                </td>
+            </tr>
+        <?php endif; ?>
+        <tr>
+            <td class="descField">
+                <?php echo __('Clave Maestra actual'); ?>
+            </td>
+            <td class="valField">
+                <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                    <input id="curMasterPwd" name="curMasterPwd" type="password"
+                           class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__input-show"
+                           maxlength="255" required/>
+                    <label class="mdl-textfield__label"
+                           for="curMasterPwd"><?php echo __('Clave Maestra actual'); ?></label>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td class="descField">
+                <?php echo __('Nueva Clave Maestra'); ?>
+            </td>
+            <td class="valField">
+                <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                    <input id="newMasterPwd" name="newMasterPwd" type="password"
+                           class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__input"
+                           maxlength="255" required/>
+                    <label class="mdl-textfield__label"
+                           for="newMasterPwd"><?php echo __('Nueva Clave Maestra'); ?></label>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td class="descField">
+                <?php echo __('Nueva Clave Maestra (repetir)'); ?>
+            </td>
+            <td class="valField">
+                <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                    <input id="newMasterPwdR" name="newMasterPwdR" type="password"
+                           class="mdl-textfield__input mdl-color-text--indigo-400"
+                           maxlength="255" required/>
+                    <label class="mdl-textfield__label"
+                           for="newMasterPwdR"><?php echo __('Nueva Clave Maestra (repetir)'); ?></label>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td class="descField">
+                <div id="help-chkNoAccountChange"
+                     class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
+                <div class="mdl-tooltip mdl-tooltip--large" for="help-chkNoAccountChange">
+                    <p>
+                        <?php echo __('Establece una nueva clave maestra sin re-encriptar las cuentas'); ?>
+                    </p>
+                </div>
+            </td>
+            <td class="valField">
+                <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="chkNoAccountChange">
+                    <input type="checkbox" id="chkNoAccountChange"
+                           class="mdl-switch__input mdl-color-text--indigo-400" name="chkNoAccountChange"/>
+                    <span class="mdl-switch__label"><?php echo __('No modificar cuentas'); ?></span>
+                </label>
+            </td>
+        </tr>
+        <tr>
+            <td class="descField"></td>
+            <td class="valField">
+                <div
+                        class="icon material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></div>
+                <?php echo __('Guarde la nueva clave en un lugar seguro.'); ?>
+                <br>
+                <div
+                        class="icon material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></div>
+                <?php echo __('Se volverán a encriptar las claves de todas las cuentas.'); ?>
+                <br>
+                <div
+                        class="icon material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></div>
+                <?php echo __('Los usuarios deberán de introducir la nueva clave maestra.'); ?>
+                <br>
+                <div
+                        class="icon material-icons <?php echo $icons->getIconWarning()->getClass(); ?>"><?php echo $icons->getIconWarning()->getIcon(); ?></div>
+                <strong><?php printf(__('Se van a actualizar %s cuentas. Este proceso puede tardar algo de tiempo.'), $numAccounts); ?></strong>
+                <br>
+                <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="confirmPassChange">
+                    <input type="checkbox" id="confirmPassChange" class="mdl-switch__input"
+                           name="confirmPassChange"/>
+                    <span class="mdl-switch__label"><?php echo __('Confirmar cambio'); ?></span>
+                </label>
+            </td>
+        </tr>
+    </table>
+
+    <?php if ($numAccounts >= 500): ?>
+        <input type="hidden" name="useTask" value="1">
+        <input type="hidden" name="taskId" value="<?php echo $taskId; ?>">
+        <input type="hidden" name="lock" value="masterpass">
+    <?php endif; ?>
+</form>
+<div class="tab-actions">
+    <ul>
+        <li>
+            <button id="help_mpass_button" type="button"
+                    class="btn-help mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
+                    title="<?php echo $icons->getIconHelp()->getTitle(); ?>"
+                    data-help="help_mpass">
+                <i class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
+            </button>
+
+            <div id="help_mpass" class="help-box" title="<?php echo __('Ayuda'); ?>">
+                <p class="help-text"><?php echo __('La clave maestra es utilizada para encriptar las claves de las cuentas de sysPass para mantenerlas seguras.'); ?></p>
+
+                <p class="help-text"><?php echo __('Es recomendable cambiarla cada cierto tiempo y utilizar una clave compleja que incluya números, letras y símbolos.'); ?></p>
+
+                <p class="help-text"><?php printf(__('Para más información consulte: %s'), '<a target="_blank" href="https://doc.syspass.org">https://doc.syspass.org</a>'); ?></p>
+            </div>
+        </li>
+        <?php if ($userIsAdminApp): ?>
+            <li>
+                <button type="button"
+                        class="btn-action mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconCheck()->getClassButton(); ?>"
+                        data-onclick="config/refreshMpass"
+                        data-action-id="<?php echo \SP\Core\Acl\ActionsInterface::ENCRYPTION_REFRESH; ?>"
+                        title="<?php echo __('Actualizar hash de clave maestra'); ?>">
+                    <i class="material-icons"><?php echo $icons->getIconRefresh()->getIcon(); ?></i>
+                </button>
+            </li>
+        <?php endif; ?>
+
+        <?php if ($numAccounts > 0): ?>
+            <li>
+                <button form="frmCrypt"
+                        class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconPlay()->getClassButton(); ?>"
+                        title="<?php echo $icons->getIconPlay()->getTitle(); ?>">
+                    <i class="material-icons"><?php echo $icons->getIconPlay()->getIcon(); ?></i>
+                </button>
+            </li>
+        <?php endif; ?>
+    </ul>
+</div>
+
+<div id="title" class="midroundup titleNormal">
+    <?php echo __('Clave Temporal'); ?>
+</div>
+
+<form method="post" name="frmTempMasterPass" id="frmTempMasterPass" class="form-action"
+      data-onsubmit="config/save"
+      data-type="temppass"
+      data-nextaction-id="<?php echo \SP\Core\Acl\ActionsInterface::ENCRYPTION_TEMPPASS; ?>">
+    <table class="data tblConfig round">
+        <tr>
+            <td class="descField">
+                <?php echo __('Último cambio'); ?>
+            </td>
+            <td class="valField">
+                <div class="lowres-title"><?php echo __('Último cambio'); ?></div>
+
+                <?php echo ($tempMasterPassTime > 0) ? date('r', $tempMasterPassTime) : __('No generada'); ?>
+            </td>
+        </tr>
+        <tr>
+            <td class="descField">
+                <?php echo __('Válido hasta'); ?>
+            </td>
+            <td class="valField">
+                <div class="lowres-title"><?php echo __('Válido hasta'); ?></div>
+
+                <?php if (time() > $tempMasterMaxTime): ?>
+                    <span style="color: red"><?php echo date('r', $tempMasterMaxTime); ?></span>
+                <?php elseif ($tempMasterMaxTime > 0): echo date('r', $tempMasterMaxTime); ?>
+                <?php else: echo __('No generada'); ?>
+                <?php endif; ?>
+            </td>
+        </tr>
+        <tr>
+            <td class="descField">
+                <?php echo __('Intentos'); ?>
+            </td>
+            <td class="valField">
+                <div class="lowres-title"><?php echo __('Intentos'); ?></div>
+
+                <?php echo $tempMasterAttempts; ?>
+            </td>
+        </tr>
+        <tr>
+            <td class="descField">
+                <?php echo __('Validez (s)'); ?>
+            </td>
+            <td class="valField">
+                <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                    <input id="tmpass_maxtime" name="tmpass_maxtime" type="number" step="600"
+                           pattern="[0-9]{2,6}" class="mdl-textfield__input mdl-color-text--indigo-400"
+                           value="3600"
+                           required/>
+                    <label class="mdl-textfield__label"
+                           for="tmpass_maxtime"><?php echo __('Validez (s)'); ?></label>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td class="descField">
+
+
+                <div id="help-chkSendEmail"
+                     class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
+                <div class="mdl-tooltip mdl-tooltip--large" for="help-chkSendEmail">
+                    <p>
+                        <?php echo __('Envía un correo a todos los usuarios o sólo a los del grupo seleccionado.'); ?>
+                    </p>
+                </div>
+            </td>
+            <td class="valField">
+                <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="tmpass_chkSendEmail">
+                    <input type="checkbox" id="tmpass_chkSendEmail"
+                           class="mdl-switch__input mdl-color-text--indigo-400" name="tmpass_chkSendEmail"/>
+                    <span class="mdl-switch__label"><?php echo __('Enviar correo'); ?></span>
+                </label>
+            </td>
+        </tr>
+        <tr>
+            <td class="descField">
+                <?php echo __('Grupo'); ?>
+            </td>
+            <td class="valField">
+                <div class="lowres-title"><?php echo __('Grupo'); ?></div>
+
+                <select id="tmpass_group" name="tmpass_group"
+                        class="select-box select-box-deselect">
+                    <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
+                    <?php /** @var \SP\Mvc\View\Components\SelectItem[] $groups */
+                    foreach ($userGroups as $userGroup): ?>
+                        <option
+                                value="<?php echo $userGroup->getId(); ?>"><?php echo $userGroup->getName(); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </td>
+        </tr>
+        <?php if (!empty($tempMasterPass)): ?>
+            <tr>
+                <td class="descField">
+                    <?php echo __('Clave'); ?>
+                </td>
+                <td class="valField">
+                    <div class="lowres-title"><?php echo __('Clave'); ?></div>
+
+                    <?php echo $tempMasterPass; ?>
+                </td>
+            </tr>
+        <?php endif; ?>
+    </table>
+    <input type="hidden" name="sk" value="">
+    <input type="hidden" name="isAjax" value="1"/>
+</form>
+
+<div class="tab-actions">
+    <ul>
+        <li>
+            <button id="btnBack" type="button"
+                    class="btn-back mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconBack()->getClassButton(); ?>"
+                    title="<?php echo __('Atrás'); ?>">
+                <i class="material-icons"><?php echo $icons->getIconBack()->getIcon(); ?></i>
+            </button>
+        </li>
+        <li>
+            <button id="help_tmpass_button"
+                    class="btn-help mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
+                    title="<?php echo $icons->getIconHelp()->getTitle(); ?>"
+                    data-help="help_tmpass">
+                <i class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
+            </button>
+
+
+            <div id="help_tmpass" class="help-box" title="<?php echo __('Ayuda'); ?>">
+                <p class="help-text"><?php echo __('La clave temporal es utilizada como clave maestra para los usuarios que necesitan introducirla al iniciar la sesión, así no es necesario facilitar la clave maestra original.'); ?></p>
+            </div>
+        </li>
+        <li>
+            <button form="frmTempMasterPass"
+                    class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconPlay()->getClassButton(); ?>"
+                    title="<?php echo __('Generar'); ?>">
+                <i class="material-icons"><?php echo $icons->getIconPlay()->getIcon(); ?></i>
+            </button>
+        </li>
+    </ul>
+</div>
diff --git a/app/modules/web/themes/material-blue/views/config/import.inc b/app/modules/web/themes/material-blue/views/config/import.inc
index 914ce33d..cd554bbb 100644
--- a/app/modules/web/themes/material-blue/views/config/import.inc
+++ b/app/modules/web/themes/material-blue/views/config/import.inc
@@ -1,197 +1,197 @@
-<?php /** @var $icons \Theme\Icons */
-use SP\Core\SessionFactory; ?>
+<?php
+/**
+ * @var  $icons \Theme\Icons
+ * @var  $this  \SP\Mvc\View\Template
+ */
+?>
 
-<!-- Start Tab - Import -->
-<div id="tabs-<?php echo $import_tabIndex; ?>" class="mdl-tabs__panel">
-    <div class="tab-data">
-        <div id="title" class="midroundup titleNormal">
-            <?php echo __('Importar CSV/XML'); ?>
-        </div>
+<div id="title" class="midroundup titleNormal">
+    <?php echo __('Importar CSV/XML'); ?>
+</div>
 
-        <table class="data tblConfig round">
-            <tr>
-                <td class="descField">
-                    <?php echo __('Usuario por Defecto'); ?>
-                    <div id="help-import_defaultuser"
-                         class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
-                    <div class="mdl-tooltip mdl-tooltip--large" for="help-import_defaultuser">
-                        <p>
-                            <?php echo __('Define el usuario por defecto para las cuentas importadas.'); ?>
-                        </p>
-                    </div>
-                </td>
-                <td class="valField">
-                    <div class="lowres-title"><?php echo __('Usuario por Defecto'); ?></div>
+<table class="data tblConfig round">
+    <tr>
+        <td class="descField">
+            <?php echo __('Usuario por Defecto'); ?>
+            <div id="help-import_defaultuser"
+                 class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
+            <div class="mdl-tooltip mdl-tooltip--large" for="help-import_defaultuser">
+                <p>
+                    <?php echo __('Define el usuario por defecto para las cuentas importadas.'); ?>
+                </p>
+            </div>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('Usuario por Defecto'); ?></div>
 
-                    <select id="import_defaultuser" name="import_defaultuser"
-                            class="select-box sel-chosen-user" required>
-                        <option value=""><?php echo __('Seleccionar Usuario'); ?></option>
-                        <?php foreach ($users as $user): ?>
-                            <option
-                                    value="<?php echo $user->id; ?>" <?php echo ($user->id === SessionFactory::getUserData()->getId()) ? 'selected' : ''; ?>>
-                                <?php echo $user->name; ?>
-                            </option>
-                        <?php endforeach; ?>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td class="descField">
-                    <?php echo __('Grupo por Defecto'); ?>
-                    <div id="help-import_defaultgroup"
-                         class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
-                    <div class="mdl-tooltip mdl-tooltip--large" for="help-import_defaultgroup">
-                        <p>
-                            <?php echo __('Define el grupo por defecto para las cuentas importadas.'); ?>
-                        </p>
-                    </div>
-                </td>
-                <td class="valField">
-                    <div class="lowres-title"><?php echo __('Grupo por Defecto'); ?></div>
+            <select id="import_defaultuser" name="import_defaultuser"
+                    class="select-box sel-chosen-user" required>
+                <option value=""><?php echo __('Seleccionar Usuario'); ?></option>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $users */
+                foreach ($users as $user): ?>
+                    <option
+                            value="<?php echo $user->getId(); ?>" <?php echo $user->isSelected() ? 'selected' : ''; ?>>
+                        <?php echo $user->getName(); ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td class="descField">
+            <?php echo __('Grupo por Defecto'); ?>
+            <div id="help-import_defaultgroup"
+                 class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
+            <div class="mdl-tooltip mdl-tooltip--large" for="help-import_defaultgroup">
+                <p>
+                    <?php echo __('Define el grupo por defecto para las cuentas importadas.'); ?>
+                </p>
+            </div>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('Grupo por Defecto'); ?></div>
 
-                    <select id="import_defaultgroup" name="import_defaultgroup"
-                            class="select-box sel-chosen-usergroup" required>
-                        <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
-                        <?php foreach ($groups as $group): ?>
-                            <option
-                                    value="<?php echo $group->id; ?>" <?php echo ($group->id === $SessionUserData->getUserGroupId()) ? 'selected' : ''; ?>>
-                                <?php echo $group->name; ?>
-                            </option>
-                        <?php endforeach; ?>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td class="descField">
-                    <?php echo __('Archivo'); ?>
-                </td>
-                <td class="valField">
-                    <div class="lowres-title"><?php echo __('Archivo'); ?></div>
+            <select id="import_defaultgroup" name="import_defaultgroup"
+                    class="select-box sel-chosen-usergroup" required>
+                <option value=""><?php echo __('Seleccionar Grupo'); ?></option>
+                <?php /** @var \SP\Mvc\View\Components\SelectItem[] $userGroups */
+                foreach ($userGroups as $userGroup): ?>
+                    <option
+                            value="<?php echo $userGroup->getId(); ?>" <?php echo $userGroup->isSelected() ? 'selected' : ''; ?>>
+                        <?php echo $userGroup->getName(); ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td class="descField">
+            <?php echo __('Archivo'); ?>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('Archivo'); ?></div>
 
-                    <div id="drop-import-files" class="round active-tooltip dropzone"
-                         data-files-ext="csv,xml"
-                         data-action-id="<?php echo \SP\Core\ActionsInterface::IMPORT; ?>"
-                         title="<?php echo __('Soltar archivo aquí o click para seleccionar'); ?>">
-                        <i class="material-icons md-60 mdl-color-text--teal-500">cloud_upload</i>
-                    </div>
-                    <form method="post" enctype="multipart/form-data" name="upload_form" id="fileUploadForm">
-                        <input type="file" id="inFile" multiple name="inFile"/>
-                    </form>
-                </td>
-            </tr>
-        </table>
+            <div id="drop-import-files" class="round active-tooltip dropzone"
+                 data-files-ext="csv,xml"
+                 title="<?php echo __('Soltar archivo aquí o click para seleccionar'); ?>">
+                <i class="material-icons md-60 mdl-color-text--teal-500">cloud_upload</i>
+            </div>
+            <form method="post" enctype="multipart/form-data" name="upload_form" id="fileUploadForm">
+                <input type="file" id="inFile" multiple name="inFile"/>
+            </form>
+        </td>
+    </tr>
+</table>
 
-        <div class="tab-actions">
-            <ul>
-                <li>
-                    <button id="btnBack" type="button"
-                            class="btn-back mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconBack()->getClassButton(); ?>"
-                            title="<?php echo __('Atrás'); ?>">
-                        <i class="material-icons"><?php echo $icons->getIconBack()->getIcon(); ?></i>
-                    </button>
-                </li>
-                <li>
-                    <button id="help_import_button"
-                            class="btn-help mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
-                            title="<?php echo $icons->getIconHelp()->getTitle(); ?>"
-                            data-help="help_import">
-                        <i class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
-                    </button>
+<div class="tab-actions">
+    <ul>
+        <li>
+            <button id="btnBack" type="button"
+                    class="btn-back mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconBack()->getClassButton(); ?>"
+                    title="<?php echo __('Atrás'); ?>">
+                <i class="material-icons"><?php echo $icons->getIconBack()->getIcon(); ?></i>
+            </button>
+        </li>
+        <li>
+            <button id="help_import_button"
+                    class="btn-help mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored"
+                    title="<?php echo $icons->getIconHelp()->getTitle(); ?>"
+                    data-help="help_import">
+                <i class="material-icons"><?php echo $icons->getIconHelp()->getIcon(); ?></i>
+            </button>
 
-                    <div id="help_import" class="help-box" title="<?php echo __('Ayuda'); ?>">
-                        <p class="help-text"><?php echo __('Permite realizar la importación de Cuentas, Categorías y Clientes desde archivos XML y CSV.'); ?></p>
+            <div id="help_import" class="help-box" title="<?php echo __('Ayuda'); ?>">
+                <p class="help-text"><?php echo __('Permite realizar la importación de Cuentas, Categorías y Clientes desde archivos XML y CSV.'); ?></p>
 
-                        <p class="help-text"><?php echo __('Los formatos de archivos XML soportados son: sysPass, KeePass y KeePassX'); ?></p>
+                <p class="help-text"><?php echo __('Los formatos de archivos XML soportados son: sysPass, KeePass y KeePassX'); ?></p>
 
-                        <p class="help-text"><?php echo __('Arrastar el archivo a importar a la zona indicada o hacer click sobre la flecha.'); ?></p>
+                <p class="help-text"><?php echo __('Arrastar el archivo a importar a la zona indicada o hacer click sobre la flecha.'); ?></p>
 
-                        <p class="help-text"><?php echo __('Para archivos de KeePass o KeePassX, el nombre del cliente será igual a KeePass o KeePassX y la categoría igual al nombre de los grupos.'); ?></p>
+                <p class="help-text"><?php echo __('Para archivos de KeePass o KeePassX, el nombre del cliente será igual a KeePass o KeePassX y la categoría igual al nombre de los grupos.'); ?></p>
 
-                        <p class="help-text"><?php echo __('La importación de archivos CSV se realiza con el siguiente formato:'); ?></p>
+                <p class="help-text"><?php echo __('La importación de archivos CSV se realiza con el siguiente formato:'); ?></p>
 
-                        <p class="help-text"><?php echo __('"nombre_de_cuenta";"cliente";"categoría";"url";"usuario";"clave";"notas"'); ?></p>
+                <p class="help-text"><?php echo __('"nombre_de_cuenta";"cliente";"categoría";"url";"usuario";"clave";"notas"'); ?></p>
 
-                        <p class="help-text"><?php echo __('En todos los casos, si el cliente o la categoría no están creados, se crean automáticamente.'); ?></p>
-                    </div>
-                </li>
-            </ul>
-        </div>
+                <p class="help-text"><?php echo __('En todos los casos, si el cliente o la categoría no están creados, se crean automáticamente.'); ?></p>
+            </div>
+        </li>
+    </ul>
+</div>
 
-        <div id="title" class="midroundup titleNormal">
-            <?php echo __('XML'); ?>
-        </div>
+<div id="title" class="midroundup titleNormal">
+    <?php echo __('XML'); ?>
+</div>
 
-        <table class="data tblConfig round">
-            <tr>
-                <td class="descField">
-                    <?php echo __('Clave de Importación'); ?>
-                    <div id="help-import_pwd"
-                         class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
-                    <div class="mdl-tooltip mdl-tooltip--large" for="help-import_pwd">
-                        <p>
-                            <?php echo __('Sólo es necesaria para archivos XML de sysPass encriptados.'); ?>
-                        </p>
-                    </div>
-                </td>
-                <td class="valField">
-                    <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                        <input id="importPwd" name="importPwd" type="password"
-                               class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__input-show"
-                               maxlength="255"/>
-                        <label class="mdl-textfield__label"
-                               for="importPwd"><?php echo __('Clave de Importación'); ?></label>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td class="descField">
-                    <?php echo __('Clave Maestra'); ?>
-                    <div id="help-import_masterpwd"
-                         class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
-                    <div class="mdl-tooltip mdl-tooltip--large" for="help-import_masterpwd">
-                        <p>
-                            <?php echo __('Sólo es necesaria para archivos XML de sysPass con clave maestra distinta de la actual.'); ?>
-                        </p>
-                    </div>
-                </td>
-                <td class="valField">
-                    <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                        <input id="importMasterPwd" name="importMasterPwd" type="password"
-                               class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__input-show"
-                               maxlength="255"/>
-                        <label class="mdl-textfield__label"
-                               for="importMasterPwd"><?php echo __('Clave Maestra'); ?></label>
-                    </div>
-                </td>
-            </tr>
-        </table>
+<table class="data tblConfig round">
+    <tr>
+        <td class="descField">
+            <?php echo __('Clave de Importación'); ?>
+            <div id="help-import_pwd"
+                 class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
+            <div class="mdl-tooltip mdl-tooltip--large" for="help-import_pwd">
+                <p>
+                    <?php echo __('Sólo es necesaria para archivos XML de sysPass encriptados.'); ?>
+                </p>
+            </div>
+        </td>
+        <td class="valField">
+            <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                <input id="importPwd" name="importPwd" type="password"
+                       class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__input-show"
+                       maxlength="255"/>
+                <label class="mdl-textfield__label"
+                       for="importPwd"><?php echo __('Clave de Importación'); ?></label>
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td class="descField">
+            <?php echo __('Clave Maestra'); ?>
+            <div id="help-import_masterpwd"
+                 class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
+            <div class="mdl-tooltip mdl-tooltip--large" for="help-import_masterpwd">
+                <p>
+                    <?php echo __('Sólo es necesaria para archivos XML de sysPass con clave maestra distinta de la actual.'); ?>
+                </p>
+            </div>
+        </td>
+        <td class="valField">
+            <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                <input id="importMasterPwd" name="importMasterPwd" type="password"
+                       class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__input-show"
+                       maxlength="255"/>
+                <label class="mdl-textfield__label"
+                       for="importMasterPwd"><?php echo __('Clave Maestra'); ?></label>
+            </div>
+        </td>
+    </tr>
+</table>
 
-        <div id="title" class="midroundup titleNormal">
-            <?php echo __('CSV'); ?>
-        </div>
+<div id="title" class="midroundup titleNormal">
+    <?php echo __('CSV'); ?>
+</div>
 
-        <table class="data tblConfig round">
-            <tr>
-                <td class="descField">
-                    <?php echo __('Delimitador CSV'); ?>
-                    <div id="help-import_csvdelimiter"
-                         class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
-                    <div class="mdl-tooltip mdl-tooltip--large" for="help-import_csvdelimiter">
-                        <p>
-                            <?php echo __('Sólo es necesario para archivos CSV.'); ?>
-                        </p>
-                    </div>
-                </td>
-                <td class="valField">
-                    <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-                        <input id="csvDelimiter" name="csvDelimiter" type="text"
-                               class="mdl-textfield__input mdl-color-text--indigo-400"
-                               maxlength="1" value=";"/>
-                        <label class="mdl-textfield__label"
-                               for="csvDelimiter"><?php echo __('Delimitador CSV'); ?></label>
-                    </div>
-                </td>
-            </tr>
-        </table>
-    </div>
-</div> <!-- End Tab - Import -->
\ No newline at end of file
+<table class="data tblConfig round">
+    <tr>
+        <td class="descField">
+            <?php echo __('Delimitador CSV'); ?>
+            <div id="help-import_csvdelimiter"
+                 class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
+            <div class="mdl-tooltip mdl-tooltip--large" for="help-import_csvdelimiter">
+                <p>
+                    <?php echo __('Sólo es necesario para archivos CSV.'); ?>
+                </p>
+            </div>
+        </td>
+        <td class="valField">
+            <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                <input id="csvDelimiter" name="csvDelimiter" type="text"
+                       class="mdl-textfield__input mdl-color-text--indigo-400"
+                       maxlength="1" value=";"/>
+                <label class="mdl-textfield__label"
+                       for="csvDelimiter"><?php echo __('Delimitador CSV'); ?></label>
+            </div>
+        </td>
+    </tr>
+</table>
diff --git a/app/modules/web/themes/material-blue/views/config/info.inc b/app/modules/web/themes/material-blue/views/config/info.inc
index 7a878f7d..cd78d82e 100644
--- a/app/modules/web/themes/material-blue/views/config/info.inc
+++ b/app/modules/web/themes/material-blue/views/config/info.inc
@@ -1,127 +1,124 @@
-<!-- Start Tab - Info -->
-<div id="tabs-<?php echo $info_tabIndex; ?>" class="mdl-tabs__panel">
-    <div class="tab-data">
-        <div id="title" class="midroundup titleNormal">
-            <?php echo __('Información de la Aplicación'); ?>
-        </div>
+<div id="title" class="midroundup titleNormal">
+    <?php echo __('Información de la Aplicación'); ?>
+</div>
 
-        <table class="data round">
-            <tr>
-                <td class="descField">
-                    <?php echo __('Versión sysPass'); ?>
-                </td>
-                <td class="valField">
-                    <div class="lowres-title"><?php echo __('Versión sysPass'); ?></div>
+<table class="data round">
+    <tr>
+        <td class="descField">
+            <?php echo __('Versión sysPass'); ?>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('Versión sysPass'); ?></div>
 
-                    <?php printf('%s (%s)', \SP\Util\Util::getVersionString(), \SP\Html\Html::strongText(\SP\Util\Util::getVersionStringNormalized())); ?>
-                </td>
-            </tr>
-            <tr>
-                <td class="descField">
-                    <?php echo __('Base de Datos'); ?>
-                </td>
-                <td class="valField">
-                    <div class="lowres-title"><?php echo __('Base de Datos'); ?></div>
+            <?php printf('%s (%s)', \SP\Util\Util::getVersionString(), \SP\Html\Html::strongText(\SP\Util\Util::getVersionStringNormalized())); ?>
+        </td>
+    </tr>
+    <tr>
+        <td class="descField">
+            <?php echo __('Base de Datos'); ?>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('Base de Datos'); ?></div>
 
-                    <?php foreach ($dbInfo as $infoattr => $infoval): ?>
-                        <?php printf('%s : %s', \SP\Html\Html::strongText($infoattr), $infoval); ?>
-                        <br>
-                    <?php endforeach; ?>
-                    <?php printf('%s: %s', \SP\Html\Html::strongText(__('Nombre')), (!$isDemoMode) ? $dbName : '***'); ?>
-                </td>
-            </tr>
-            <tr>
-                <td class="descField">
-                    <?php echo __('PHP'); ?>
-                </td>
-                <td class="valField">
-                    <div class="lowres-title"><?php echo __('PHP'); ?></div>
+            <?php foreach ($dbInfo as $infoattr => $infoval): ?>
+                <?php printf('%s : %s', \SP\Html\Html::strongText($infoattr), $infoval); ?>
+                <br>
+            <?php endforeach; ?>
+            <?php printf('%s: %s', \SP\Html\Html::strongText(__('Nombre')), (!$isDemo) ? $dbName : '***'); ?>
+        </td>
+    </tr>
+    <tr>
+        <td class="descField">
+            <?php echo __('PHP'); ?>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('PHP'); ?></div>
 
-                    <?php printf('%s: %s', \SP\Html\Html::strongText(__('Versión')), (!$isDemoMode) ? phpversion() : '***'); ?>
-                    <br>
-                    <?php printf('%s: %s', \SP\Html\Html::strongText(__('Extensiones')), implode(', ', get_loaded_extensions())); ?>
-                    <br>
-                    <?php printf('%s: %d KB', \SP\Html\Html::strongText(__('Memoria Usada')), (memory_get_usage(true) / 1024)); ?>
-                    <br>
-                    <?php printf('%s: %s', \SP\Html\Html::strongText(__('Usuario')), (!$isDemoMode) ? get_current_user() : '***'); ?>
-                    <?php if (function_exists('opcache_get_status') && version_compare(PHP_VERSION, '5.6.0', '>=')): ?>
-                        <br>
-                        <?php echo \SP\Html\Html::strongText(__('OP Cache')); ?>
-                        <?php foreach (opcache_get_status(false)['opcache_statistics'] as $key => $value): ?>
-                            <br><?php printf('%s : %s', $key, $value); ?>
-                        <?php endforeach; ?>
-                    <?php endif; ?>
-                </td>
-            </tr>
-            <tr>
-                <td class="descField">
-                    <?php echo __('Servidor'); ?>
-                </td>
-                <td class="valField">
-                    <div class="lowres-title"><?php echo __('Servidor'); ?></div>
+            <?php printf('%s: %s', \SP\Html\Html::strongText(__('Versión')), (!$isDemo) ? phpversion() : '***'); ?>
+            <br>
+            <?php printf('%s: %s', \SP\Html\Html::strongText(__('Extensiones')), implode(', ', get_loaded_extensions())); ?>
+            <br>
+            <?php printf('%s: %d KB', \SP\Html\Html::strongText(__('Memoria Usada')), (memory_get_usage(true) / 1024)); ?>
+            <br>
+            <?php printf('%s: %s', \SP\Html\Html::strongText(__('Usuario')), (!$isDemo) ? get_current_user() : '***'); ?>
+            <?php if (function_exists('opcache_get_status') && version_compare(PHP_VERSION, '5.6.0', '>=')): ?>
+                <br>
+                <?php echo \SP\Html\Html::strongText(__('OP Cache')); ?>
+                <?php foreach (opcache_get_status(false)['opcache_statistics'] as $key => $value): ?>
+                    <br><?php printf('%s : %s', $key, $value); ?>
+                <?php endforeach; ?>
+            <?php endif; ?>
+        </td>
+    </tr>
+    <tr>
+        <td class="descField">
+            <?php echo __('Servidor'); ?>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('Servidor'); ?></div>
 
-                    <?php echo (!$isDemoMode) ? \SP\Html\Html::strongText($_SERVER['SERVER_SOFTWARE']) : '***'; ?>
-                </td>
-            </tr>
-            <tr>
-                <td class="descField">
-                    <?php echo __('Copia de Configuración'); ?>
-                </td>
-                <td class="valField">
-                    <div class="lowres-title"><?php echo __('Copia de Configuración'); ?></div>
+            <?php echo (!$isDemo) ? \SP\Html\Html::strongText($_SERVER['SERVER_SOFTWARE']) : '***'; ?>
+        </td>
+    </tr>
+    <tr>
+        <td class="descField">
+            <?php echo __('Copia de Configuración'); ?>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('Copia de Configuración'); ?></div>
 
-                    <?php echo $configBackupDate; ?>
-                </td>
-            </tr>
-            <tr>
-                <td class="descField">
-                    <?php echo __('Idioma'); ?>
-                    <div id="help-infolang"
-                         class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
-                    <div class="mdl-tooltip mdl-tooltip--large" for="help-infolang">
-                        <p>
-                            <?php echo __('Indica si el idioma se encuentra disponible'); ?>
-                        </p>
+            <?php echo $configBackupDate; ?>
+        </td>
+    </tr>
+    <tr>
+        <td class="descField">
+            <?php echo __('Idioma'); ?>
+            <div id="help-infolang"
+                 class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
+            <div class="mdl-tooltip mdl-tooltip--large" for="help-infolang">
+                <p>
+                    <?php echo __('Indica si el idioma se encuentra disponible'); ?>
+                </p>
 
-                        <p>
-                            <?php echo __('Si no está instalado, es necesario instalar las locales en el sistema operativo. Más información en Wiki.'); ?>
-                        </p>
-                    </div>
-                </td>
-                <td class="valField">
-                    <div class="lowres-title"><?php echo __('Idioma'); ?></div>
+                <p>
+                    <?php echo __('Si no está instalado, es necesario instalar las locales en el sistema operativo. Más información en Wiki.'); ?>
+                </p>
+            </div>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('Idioma'); ?></div>
 
-                    <?php echo $locale; ?>
-                </td>
-            </tr>
-            <tr>
-                <td class="descField">
-                    <?php echo __('Sesión Encriptada'); ?>
-                    <div id="help-infosession"
-                         class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
-                    <div class="mdl-tooltip mdl-tooltip--large" for="help-infosession">
-                        <p>
-                            <?php echo __('Indica si los datos de la sesión están encriptados en el servidor'); ?>
-                        </p>
-                    </div>
-                </td>
-                <td class="valField">
-                    <div class="lowres-title"><?php echo __('Sesión Encriptada'); ?></div>
+            <?php echo $locale; ?>
+        </td>
+    </tr>
+    <tr>
+        <td class="descField">
+            <?php echo __('Sesión Encriptada'); ?>
+            <div id="help-infosession"
+                 class="icon material-icons <?php echo $icons->getIconHelp()->getClass(); ?>"><?php echo $icons->getIconHelp()->getIcon(); ?></div>
+            <div class="mdl-tooltip mdl-tooltip--large" for="help-infosession">
+                <p>
+                    <?php echo __('Indica si los datos de la sesión están encriptados en el servidor'); ?>
+                </p>
+            </div>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('Sesión Encriptada'); ?></div>
 
-                    <?php echo $securedSession ? __('Sí') : __('No'); ?>
-                </td>
-            </tr>
-            <tr>
-                <td class="descField">
-                    <?php echo __('Plugins Cargados'); ?>
-                </td>
-                <td class="valField">
-                    <div class="lowres-title"><?php echo __('Plugins Cargados'); ?></div>
+            <?php echo $securedSession ? __('Sí') : __('No'); ?>
+        </td>
+    </tr>
+    <tr>
+        <td class="descField">
+            <?php echo __('Plugins Cargados'); ?>
+        </td>
+        <td class="valField">
+            <div class="lowres-title"><?php echo __('Plugins Cargados'); ?></div>
 
-                    <ul class="mdl-list">
-                        <?php /** @var \SP\Core\Plugin\PluginInterface[] $plugins */
-                        foreach ($plugins as $name => $plugin): ?>
-                            <li class="mdl-list__item">
+            <ul class="mdl-list">
+                <?php /** @var \SP\Core\Plugin\PluginInterface[] $plugins */
+                foreach ($plugins as $name => $plugin): ?>
+                    <li class="mdl-list__item">
                                 <span class="mdl-list__item-primary-content">
                                 <i class="material-icons mdl-list__item-icon">extension</i>
                                     <?php echo $name; ?>
@@ -130,22 +127,21 @@
                                     <br>
                                     <?php printf('Autor: %s', $plugin->getAuthor()); ?>
                                 </span>
-                            </li>
-                        <?php endforeach; ?>
-                    </ul>
-                </td>
-            </tr>
-        </table>
-    </div>
-    <div class="tab-actions">
-        <ul>
-            <li>
-                <button id="btnBack" type="button"
-                        class="btn-back mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconBack()->getClassButton(); ?>"
-                        title="<?php echo __('Atrás'); ?>">
-                    <i class="material-icons"><?php echo $icons->getIconBack()->getIcon(); ?></i>
-                </button>
-            </li>
-        </ul>
-    </div>
-</div> <!-- End Tab - Info -->
\ No newline at end of file
+                    </li>
+                <?php endforeach; ?>
+            </ul>
+        </td>
+    </tr>
+</table>
+
+<div class="tab-actions">
+    <ul>
+        <li>
+            <button id="btnBack" type="button"
+                    class="btn-back mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconBack()->getClassButton(); ?>"
+                    title="<?php echo __('Atrás'); ?>">
+                <i class="material-icons"><?php echo $icons->getIconBack()->getIcon(); ?></i>
+            </button>
+        </li>
+    </ul>
+</div>
diff --git a/lib/SP/Services/Config/ConfigService.php b/lib/SP/Services/Config/ConfigService.php
index b5a1cabb..05c0563c 100644
--- a/lib/SP/Services/Config/ConfigService.php
+++ b/lib/SP/Services/Config/ConfigService.php
@@ -59,20 +59,26 @@ class ConfigService extends Service
 
     /**
      * @param string $param
+     * @param null   $default
      * @return mixed
      * @throws ParameterNotFoundException
      */
-    public function getByParam($param)
+    public function getByParam($param, $default = null)
     {
         $query = $this->configRepository->getByParam($param);
 
         if (empty($query)) {
+            if ($default !== null) {
+                return $default;
+            }
+
             throw new ParameterNotFoundException(
                 sprintf(__('Parámetro no encontrado (%s)'),
                     SPException::ERROR,
                     $param)
             );
         }
+
         return $query->value;
     }
 
diff --git a/lib/SP/Util/Util.php b/lib/SP/Util/Util.php
index 67d97a4a..622a6bf4 100644
--- a/lib/SP/Util/Util.php
+++ b/lib/SP/Util/Util.php
@@ -371,7 +371,8 @@ class Util
             'appupdates' => 'https://api.github.com/repos/nuxsmin/sysPass/releases/latest',
             'appnotices' => 'https://api.github.com/repos/nuxsmin/sysPass/issues?milestone=none&state=open&labels=Notices',
             'apphelp' => 'https://github.com/nuxsmin/sysPass/issues',
-            'appchangelog' => 'https://github.com/nuxsmin/sysPass/blob/master/CHANGELOG'];
+            'appchangelog' => 'https://github.com/nuxsmin/sysPass/blob/master/CHANGELOG'
+        ];
 
         if (null !== $index && isset($appinfo[$index])) {
             return $appinfo[$index];