diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index af93bda499343d292a72a2d0dcdbcec82199fcbe..9f1c65a13ce2a54bca6eecaf8e0bd1a3d201d4ab 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -206,7 +206,7 @@ class PageController extends Controller {
         }
 
         // Pastell API config
-        $pastellConfigFlowId = $this->config->getAppValue($this->appName, 'pastell_config_flow' . $archiveFlowNum . '_id', '');
+        $pastellConfigFlowId = $this->config->getAppValue($this->appName, 'pastell_config_f' . $archiveFlowNum . '_id', '');
         $pastellConfigFlowMapper = new PastellConfigFlowMapper(\OC::$server->getDatabaseConnection());
         $pastellConfigFlow = $pastellConfigFlowMapper->find($pastellConfigFlowId);
 
@@ -446,7 +446,7 @@ class PageController extends Controller {
                     }
 
                     // Pastell API config
-                    $pastellConfigFlowId = $this->config->getAppValue($this->appName, 'pastell_config_flow' . $archiveFlowNum . '_id', '');
+                    $pastellConfigFlowId = $this->config->getAppValue($this->appName, 'pastell_config_f' . $archiveFlowNum . '_id', '');
                     $pastellConfigFlowMapper = new PastellConfigFlowMapper(\OC::$server->getDatabaseConnection());
                     $pastellConfigFlow = $pastellConfigFlowMapper->find($pastellConfigFlowId);
 
diff --git a/lib/Settings/AdminSettings.php b/lib/Settings/AdminSettings.php
index 99dc8a9bb59f23f18802bde5619edbb3c9310b5d..f93e255496fae9626aeed5c5c4974fdc42346136 100644
--- a/lib/Settings/AdminSettings.php
+++ b/lib/Settings/AdminSettings.php
@@ -71,12 +71,12 @@ class AdminSettings implements ISettings {
      */
     private function _assignParams() {
         // demat config
-        $this->_dematpayslipConfigList['payslip_dir']             = $this->config->getAppValue($this->appName, 'payslip_dir', 'Bulletins'); // Bulletins
-        $this->_dematpayslipConfigList['user_id']                 = $this->config->getAppValue($this->appName, 'user_id', 'demat'); // demat user
-        $this->_dematpayslipConfigList['app_data_dir']            = $this->config->getAppValue($this->appName, 'app_data_dir', 'dematpayslip'); // dematpayslip directory of user demat (upload, check, report, etc)
-        $this->_dematpayslipConfigList['pastell_use']             = $this->config->getAppValue($this->appName, 'pastell_use', ''); // uses pastell
-        $this->_dematpayslipConfigList['pastell_config_flow1_id'] = $this->config->getAppValue($this->appName, 'pastell_config_flow1_id', ''); // archiving for 5 years
-        $this->_dematpayslipConfigList['pastell_config_flow2_id'] = $this->config->getAppValue($this->appName, 'pastell_config_flow2_id', ''); // archiving for 50 years
+        $this->_dematpayslipConfigList['payslip_dir']          = $this->config->getAppValue($this->appName, 'payslip_dir', 'Bulletins'); // Bulletins
+        $this->_dematpayslipConfigList['user_id']              = $this->config->getAppValue($this->appName, 'user_id', 'demat'); // demat user
+        $this->_dematpayslipConfigList['app_data_dir']         = $this->config->getAppValue($this->appName, 'app_data_dir', 'dematpayslip'); // dematpayslip directory of user demat (upload, check, report, etc)
+        $this->_dematpayslipConfigList['pastell_use']          = $this->config->getAppValue($this->appName, 'pastell_use', ''); // uses pastell
+        $this->_dematpayslipConfigList['pastell_config_f1_id'] = $this->config->getAppValue($this->appName, 'pastell_config_f1_id'); // archiving for 5 years
+        $this->_dematpayslipConfigList['pastell_config_f2_id'] = $this->config->getAppValue($this->appName, 'pastell_config_f2_id'); // archiving for 50 years
 
         // pastell config mapper
         $pastellUse = intval($this->_dematpayslipConfigList['pastell_use']);
@@ -258,8 +258,8 @@ class AdminSettings implements ISettings {
             $this->_payslipsReshare();
         } elseif ($action === 'pastell_config') {
             $pastellUse           = filter_input(INPUT_GET, 'pastell_use', FILTER_SANITIZE_NUMBER_INT);
-            $pastellConfigFlow1Id = filter_input(INPUT_GET, 'pastell_config_flow1_id', FILTER_SANITIZE_NUMBER_INT);
-            $pastellConfigFlow2Id = filter_input(INPUT_GET, 'pastell_config_flow2_id', FILTER_SANITIZE_NUMBER_INT);
+            $pastellConfigFlow1Id = filter_input(INPUT_GET, 'pastell_config_f1_id', FILTER_SANITIZE_NUMBER_INT);
+            $pastellConfigFlow2Id = filter_input(INPUT_GET, 'pastell_config_f2_id', FILTER_SANITIZE_NUMBER_INT);
 
             $configPastellUse = $this->config->getAppValue($this->appName, 'pastell_use', '');
 
@@ -276,8 +276,8 @@ class AdminSettings implements ISettings {
             }
 
             if (count($this->_msgList['error']) <= 0) {
-                $this->config->setAppValue($this->appName, 'pastell_config_flow1_id', $pastellConfigFlow1Id);
-                $this->config->setAppValue($this->appName, 'pastell_config_flow2_id', $pastellConfigFlow2Id);
+                $this->config->setAppValue($this->appName, 'pastell_config_f1_id', $pastellConfigFlow1Id);
+                $this->config->setAppValue($this->appName, 'pastell_config_f2_id', $pastellConfigFlow2Id);
             }
         }
 
diff --git a/templates/settings/admin.php b/templates/settings/admin.php
index 84ced3b3d74fb7657a8cbd8446a691a8c0a24710..852d4034c42c9aa80db9a0260d8cbb37720a079f 100644
--- a/templates/settings/admin.php
+++ b/templates/settings/admin.php
@@ -120,23 +120,23 @@ script('dematpayslip', 'admin');
             </div>
             <?php if ($dematpayslipConfigList['pastell_use'] == 1) { ?>
             <div>
-                <label for="pastell_config_flow1_id">
+                <label for="pastell_config_f1_id">
                     <span><?php p($l->t('Flux pour archivage sur 5 ans')); ?> : </span>
-                    <select name="pastell_config_flow1_id">
+                    <select name="pastell_config_f1_id">
                         <option value=""></option>
                         <?php foreach ($pastellConfigFlowList as $pastellConfigFlow) { ?>
-                            <option value="<?php print $pastellConfigFlow->getId(); ?>" <?php print ($pastellConfigFlow->getId() == $dematpayslipConfigList['pastell_config_flow1_id'] ? 'selected="selected"' : ''); ?>><?php print $pastellConfigFlow->getLabel(); ?></option>
+                            <option value="<?php print $pastellConfigFlow->getId(); ?>" <?php print ($pastellConfigFlow->getId() == $dematpayslipConfigList['pastell_config_f1_id'] ? 'selected="selected"' : ''); ?>><?php print $pastellConfigFlow->getLabel(); ?></option>
                         <?php } ?>
                     </select>
                 </label>
             </div>
             <div>
-                <label for="pastell_config_flow2_id">
+                <label for="pastell_config_f2_id">
                     <span><?php p($l->t('Flux pour archivage sur 50 ans')); ?> : </span>
-                    <select name="pastell_config_flow2_id">
+                    <select name="pastell_config_f2_id">
                         <option value=""></option>
                         <?php foreach ($pastellConfigFlowList as $pastellConfigFlow) { ?>
-                            <option value="<?php print $pastellConfigFlow->getId(); ?>" <?php print ($pastellConfigFlow->getId() == $dematpayslipConfigList['pastell_config_flow2_id'] ? 'selected="selected"' : ''); ?>><?php print $pastellConfigFlow->getLabel(); ?></option>
+                            <option value="<?php print $pastellConfigFlow->getId(); ?>" <?php print ($pastellConfigFlow->getId() == $dematpayslipConfigList['pastell_config_f2_id'] ? 'selected="selected"' : ''); ?>><?php print $pastellConfigFlow->getLabel(); ?></option>
                         <?php } ?>
                     </select>
                 </label>