diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
index 9b81a429f32122a26e1b5b72a65a61984670c4fb..9f2e5fcdc888fbddab6804b96083a2794f9d2e76 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
@@ -397,8 +397,11 @@ sub newConf {
     $res->{details}->{'__errors__'} = $parser->{errors}
       if ( @{ $parser->{errors} } );
     unless ( @{ $parser->{errors} } ) {
-        $res->{details}->{'__needConfirmation__'} = $parser->{needConfirmation}
-          if ( @{ $parser->{needConfirmation} } && !$req->params('force') );
+        if ( @{ $parser->{needConfirmation} } && !$req->params('force') ) {
+            $res->{needConfirm} = 1;
+            $res->{details}->{'__needConfirmation__'} =
+              $parser->{needConfirmation};
+        }
         $res->{message} = $parser->{message};
         foreach my $t (qw(warnings changes)) {
             $res->{details}->{ '__' . $t . '__' } = $parser->$t
@@ -412,7 +415,7 @@ sub newConf {
             $args{cfgDate}        = $req->params('cfgDate');
             $args{currentCfgDate} = $currentCfgDate;
         }
-        my $s = CONFIG_WAS_CHANGED;
+        my $s = UNKNOWN_ERROR;
         $s = $self->confAcc->saveConf( $parser->newConf, %args )
           unless ( @{ $parser->{needConfirmation} } && !$args{force} );
         if ( $s > 0 ) {
@@ -433,8 +436,9 @@ sub newConf {
             $res->{result} = 0;
             if ( $s == CONFIG_WAS_CHANGED ) {
                 $res->{needConfirm} = 1;
-                $res->{message} .= '__needConfirmation__'
-                  unless @{ $parser->{needConfirmation} };
+                $res->{details}->{'__needConfirmation__'} ||= [];
+                push @{ $res->{details}->{'__needConfirmation__'} },
+                  { message => '__newCfgAvailableWarning__' };
             }
             else {
                 $res->{message} = $Lemonldap::NG::Common::Conf::msg;
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
index 6613cc2a79f2f4f3bd22c9f123526ba8bdac84bb..9d35e719369e5a1c0b3ae7265498e559bf7d0e19 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"الفاصل",
 "multipleSessions":"جلسات متعددة",
 "name":"اسم",
-"needConfirmation":"تتوفر إعدادات جديدة.لإجبار حفظ هذه الإعدادات, انقر على خانة الاختيار بالقرب من زر 'حفظ'",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"مشكلة شبكة الاتصال",
 "never":"Never",
 "newApp":"تطبيق جديد",
 "newCat":"فئة جديدة",
 "newCertificate":"New certificate",
 "newCfgAvailable":"إعدادات جديد متاح",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"سلسلة جديدة",
 "newCmbMod":"وحدة جديدة",
 "newCmbOver":"معايير جديدة",
@@ -1310,4 +1311,4 @@
 "yubikey2fUrl":"خدمة أل يو أر ل",
 "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey",
 "zeroConfExplanations":"لا يحتوي الخادم على إعدادات. استخدام قالب لحفظ الأول"
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/en.json b/lemonldap-ng-manager/site/htdocs/static/languages/en.json
index 19a6e2a6af1b9f6447de6788d816f9e6570947c6..44338c2a09491fd3e1c641021199c9f67268c9d7 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"Separator",
 "multipleSessions":"Multiple sessions",
 "name":"Name",
-"needConfirmation":"A new configuration is available. To force saving this one, click on the check box near the 'save' button",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"Network problem",
 "never":"Never",
 "newApp":"New application",
 "newCat":"New category",
 "newCertificate":"New certificate",
 "newCfgAvailable":"A new configuration is available",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"New chain",
 "newCmbMod":"New module",
 "newCmbOver":"New parameter",
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/es.json b/lemonldap-ng-manager/site/htdocs/static/languages/es.json
index 7714fa7d0a15a82bdc2d853f0699767ec13063dd..0c47dfcdd89410f1290ed33479e21e608a746dee 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/es.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/es.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"Separador",
 "multipleSessions":"Múltiples sesiones",
 "name":"Nombre",
-"needConfirmation":"Hay una nueva configuración disponible. Para forzar el respaldo de la actual marque el checkbox que hay junto al botón 'Salvar'",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"Problema de red",
 "never":"Never",
 "newApp":"Nueva aplicación",
 "newCat":"Nueva categoría",
 "newCertificate":"New certificate",
 "newCfgAvailable":"Hay una nueva configuración disponible",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"Nueva cadena",
 "newCmbMod":"Nuevo módulo",
 "newCmbOver":"Nuevo parámetro",
@@ -1310,4 +1311,4 @@
 "yubikey2fUrl":"URL de servicio",
 "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey",
 "zeroConfExplanations":"Server has no configuration. Use template to save the first."
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
index dcb52d689fbccf2344230a8edffd42cb9f4a7a97..353fcc76dbfef0597faed46e97a4aa16279111cc 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"Séparateur",
 "multipleSessions":"Sessions multiples",
 "name":"Nom",
-"needConfirmation":"Une nouvelle configuration est disponible. Pour sauvegarder celle-ci, cocher la case à côté du bouton 'sauver'",
+"needConfirmation":"Une confirmation est nécessaire. Pour forcer la sauvegarde, cocher la case à côté du bouton 'sauver'",
 "networkProblem":"Problème de réseau",
 "never":"Jamais",
 "newApp":"Nouvelle application",
 "newCat":"Nouvelle catégorie",
 "newCertificate":"Nouveau certificat",
 "newCfgAvailable":"Une nouvelle configuration est disponible",
+"newCfgAvailableWarning":"La configuration a été modifiée simultanément à vos changements. En forcant la sauvegarde, vous perdrez les changements précédents",
 "newChain":"Nouvelle chaîne",
 "newCmbMod":"Nouveau module",
 "newCmbOver":"Nouveau paramètre",
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/he.json b/lemonldap-ng-manager/site/htdocs/static/languages/he.json
index 28c1451e74d8e9093b471d424902d80e933172c5..06dbbf7732033fab2b870ec92d6a54f55abbfc26 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/he.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/he.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"מפריד",
 "multipleSessions":"ריבוי הפעלות",
 "name":"שם",
-"needConfirmation":"קיימות הגדרות חדשות. כדי לכפות שמירה של אלו, יש ללחוץ על תיבת הסימון ליד כפתור ה‚שמירה’",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"תקלת רשת",
 "never":"Never",
 "newApp":"יישום חדש",
 "newCat":"קטגוריה חדשה",
 "newCertificate":"אישור חדש",
 "newCfgAvailable":"קיימות הגדרות חדשות",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"שרשרת חדשה",
 "newCmbMod":"מודול חדש",
 "newCmbOver":"משתנה חדש",
@@ -1310,4 +1311,4 @@
 "yubikey2fUrl":"כתובת שירות",
 "yubikey2fUserCanRemoveKey":"לאפשר למשתמש להסיר Yubikey",
 "zeroConfExplanations":"Server has no configuration. Use template to save the first."
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/it.json b/lemonldap-ng-manager/site/htdocs/static/languages/it.json
index 2dcc7e746015e7bab10772a567882ad6a2516d81..ee2b96bb29a7ef25cd67ee5e647df8e8b5dc58f0 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"Separatore",
 "multipleSessions":"Sessioni multiple",
 "name":"Nome",
-"needConfirmation":"È disponibile una nuova configurazione. Per forzarne il salvataggio, fai clic sulla casella di controllo vicino al pulsante 'salva'",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"Problema di rete",
 "never":"Never",
 "newApp":"Nuova applicazione",
 "newCat":"NUova categoria",
 "newCertificate":"New certificate",
 "newCfgAvailable":"É disponibile una nuova configurazione",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"Nuova catena",
 "newCmbMod":"Nuovo modulo",
 "newCmbOver":"Nuovo parametro",
@@ -1310,4 +1311,4 @@
 "yubikey2fUrl":"URL del servizio",
 "yubikey2fUserCanRemoveKey":"Autorizza l'utente a rimuovere la Yubikey",
 "zeroConfExplanations":"Il server non ha alcuna configurazione. Utilizza il modello per salvare il primo."
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json
index dbe272417a02cc77d9795975127568b6ee5e650a..b0a9f97be91194349846b8f6a3a752137d8b6ced 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"Separator",
 "multipleSessions":"Wiele sesji",
 "name":"Nazwa",
-"needConfirmation":"Dostępna jest nowa konfiguracja. Aby wymusić zapisanie aktualnej, kliknij pole wyboru obok przycisku „zapisz”",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"Problem z siecią",
 "never":"Nigdy",
 "newApp":"Nowa aplikacja",
 "newCat":"Nowa kategoria",
 "newCertificate":"Nowy certyfikat",
 "newCfgAvailable":"Dostępna jest nowa konfiguracja",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"Nowy łańcuch",
 "newCmbMod":"Nowy moduł",
 "newCmbOver":"Nowy parametr",
@@ -1310,4 +1311,4 @@
 "yubikey2fUrl":"URL usługi",
 "yubikey2fUserCanRemoveKey":"Pozwól użytkownikowi usunąć Yubikey",
 "zeroConfExplanations":"Serwer nie ma konfiguracji. Użyj szablonu, aby zapisać pierwszy."
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/pt.json b/lemonldap-ng-manager/site/htdocs/static/languages/pt.json
index 604938fcead7b4f7c7c568014a0ae6d41bbdb304..a17a065f99c074f2f0463faa7d9b8d062037b5ac 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/pt.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/pt.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"Separador",
 "multipleSessions":"Múltiplas sessões",
 "name":"Nome",
-"needConfirmation":"Uma nova configuração está disponível. Para forçar salvar esta aqui, clique na caixa de seleção perto do botão 'Salvar'",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"Problema de rede",
 "never":"Nunca",
 "newApp":"Nova aplicação",
 "newCat":"Nova categoria",
 "newCertificate":"Novo certificado",
 "newCfgAvailable":"Uma nova configuração está disponível",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"Nova corrente",
 "newCmbMod":"Novo módulo",
 "newCmbOver":"Novo parâmetro",
@@ -1310,4 +1311,4 @@
 "yubikey2fUrl":"URL do serviço",
 "yubikey2fUserCanRemoveKey":"Permitir que usuário remova o Yubikey",
 "zeroConfExplanations":"O servidor não tem configuração. Use o modelo para salvar a primeira"
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/pt_BR.json b/lemonldap-ng-manager/site/htdocs/static/languages/pt_BR.json
index d12a103996981783567a5293e28e4e84058d1e09..415b3792e28baec68014eb7b358955f01d7a5101 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/pt_BR.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/pt_BR.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"Separador",
 "multipleSessions":"Múltiplas sessões",
 "name":"Nome",
-"needConfirmation":"Uma nova configuração está disponível. Para forçar salvar esta aqui, clique na caixa de seleção perto do botão 'Salvar'",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"Problema de rede",
 "never":"Nunca",
 "newApp":"Nova aplicação",
 "newCat":"Nova categoria",
 "newCertificate":"Novo certificado",
 "newCfgAvailable":"Uma nova configuração está disponível",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"Nova corrente",
 "newCmbMod":"Novo módulo",
 "newCmbOver":"Novo parâmetro",
@@ -1310,4 +1311,4 @@
 "yubikey2fUrl":"URL do serviço",
 "yubikey2fUserCanRemoveKey":"Permitir que usuário remova o Yubikey",
 "zeroConfExplanations":"O servidor não tem configuração. Use o modelo para salvar a primeira"
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json
index b40b826a1b66e411862864b66866c9cdaf3515b8..247b0ae5a057b564017bbdb5d9cf9270828969eb 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"Ayırıcı",
 "multipleSessions":"Çoklu oturumlar",
 "name":"Ad",
-"needConfirmation":"Yeni bir yapılandırma mevcut. Bunu kaydetmeye zorlamak için 'kaydet' butonunun yanındaki onay kutusuna tıklayın.",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"Ağ problemi",
 "never":"Asla",
 "newApp":"Yeni uygulama",
 "newCat":"Yeni kategori",
 "newCertificate":"Yeni sertifika",
 "newCfgAvailable":"Yeni bir yapılandırma mevcut",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"Yeni zincir",
 "newCmbMod":"Yeni modül",
 "newCmbOver":"Yeni parametre",
@@ -1310,4 +1311,4 @@
 "yubikey2fUrl":"Servis URL'si",
 "yubikey2fUserCanRemoveKey":"Yubikey'i kaldırmak için kullanıcıya izin ver",
 "zeroConfExplanations":"Sunucunun yapılandırması yok. Şimdi bir tane kaydetmek için şablonu kullanın."
-}
\ No newline at end of file
+}
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
index 2aea1f625968c917499e1b1a88f7a9200b104566..add5e132d3f4512536c6debed5946c1befc6166c 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"Dấu phân cách",
 "multipleSessions":"Nhiều phiên",
 "name":"Tên",
-"needConfirmation":"Một cấu hình mới có sẵn. Để bắt buộc lưu cấu hình này, hãy nhấp vào hộp kiểm gần nút 'Lưu' ",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"Vấn đề về mạng",
 "never":"Không bao giờ",
 "newApp":"Ứng dụng mới",
 "newCat":"Danh mục mới",
 "newCertificate":"chứng chỉ mới",
 "newCfgAvailable":"Một cấu hình mới có sẵn",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"Chuỗi mới",
 "newCmbMod":"Mô-đun mới",
 "newCmbOver":"Tham số mới",
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
index 834a07f1c90c14a1dce174fa20fc7e1746de5f5a..5a019343c480d357fac3b43544d0e5fa826c3412 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"分隔符號",
 "multipleSessions":"多工作階段",
 "name":"名稱",
-"needConfirmation":"有可用的新設定。要強制儲存這個，請點擊在「儲存」按鈕旁邊的勾選框",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"網路問題",
 "never":"永不",
 "newApp":"新應用程式",
 "newCat":"新分類",
 "newCertificate":"新憑證",
 "newCfgAvailable":"有可用的新設定",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"新鏈",
 "newCmbMod":"新模組",
 "newCmbOver":"新參數",
diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
index de59236a93a66c4e8c748fc998cdc347d384ecf5..b21afd2ba190b89c079b28f501c49313e94a76e5 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
@@ -584,13 +584,14 @@
 "multiValuesSeparator":"分隔符號",
 "multipleSessions":"多工作階段",
 "name":"名稱",
-"needConfirmation":"有可用的新設定。要強制儲存這個，請點擊在「儲存」按鈕旁邊的勾選框",
+"needConfirmation":"Confirmation required. To force the update, click on the check box near the 'save' button",
 "networkProblem":"網路問題",
 "never":"永不",
 "newApp":"新應用程式",
 "newCat":"新分類",
 "newCertificate":"新憑證",
 "newCfgAvailable":"有可用的新設定",
+"newCfgAvailableWarning":"Configuration was changed by someone else since you started editing it. By forcing this update you will lose their changes.",
 "newChain":"新鏈",
 "newCmbMod":"新模組",
 "newCmbOver":"新參數",
@@ -1310,4 +1311,4 @@
 "yubikey2fUrl":"服務 URL",
 "yubikey2fUserCanRemoveKey":"允許使用者移除 Yubikey",
 "zeroConfExplanations":"伺服器未設定。使用飯本來儲存第一個。"
-}
\ No newline at end of file
+}